diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-12 09:23:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-12 09:23:30 -0700 |
| commit | 5627511205e474f960d37a6242749c6964993836 (patch) | |
| tree | ea408d284be2ac6432dceeaf6d8222cbc1e6c8ac /arch/nios2/kernel/signal.c | |
| parent | 53da3bc2ba9e4899f32707b5cd7d18421b943687 (diff) | |
| parent | 92d5dd8cd6e2b211d32d8fbc6cf4b7470765a09f (diff) | |
Merge tag 'nios2-fix-4.0-rc4' of git://git.rocketboards.org/linux-socfpga-next
Pull arch/nios2 fix from Ley Foon Tan:
"Remove pt_regs from user header and use generic ucontext.h"
* tag 'nios2-fix-4.0-rc4' of git://git.rocketboards.org/linux-socfpga-next:
nios2: update pt_regs
Diffstat (limited to 'arch/nios2/kernel/signal.c')
| -rw-r--r-- | arch/nios2/kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c index 2d0ea25be171..dda41e4fe707 100644 --- a/arch/nios2/kernel/signal.c +++ b/arch/nios2/kernel/signal.c @@ -39,7 +39,7 @@ static inline int rt_restore_ucontext(struct pt_regs *regs, struct ucontext *uc, int *pr2) { int temp; - greg_t *gregs = uc->uc_mcontext.gregs; + unsigned long *gregs = uc->uc_mcontext.gregs; int err; /* Always make any pending restarted system calls return -EINTR */ @@ -127,7 +127,7 @@ badframe: static inline int rt_setup_ucontext(struct ucontext *uc, struct pt_regs *regs) { struct switch_stack *sw = (struct switch_stack *)regs - 1; - greg_t *gregs = uc->uc_mcontext.gregs; + unsigned long *gregs = uc->uc_mcontext.gregs; int err = 0; err |= __put_user(MCONTEXT_VERSION, &uc->uc_mcontext.version); |