diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-09-13 11:08:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-13 11:09:04 +0200 |
| commit | 76bf6877fed4f59826a72e0ab209badfc594008a (patch) | |
| tree | 3e66280e0579c716991fb7cd67d771d0b8766358 /arch/openrisc/include/asm/sigcontext.h | |
| parent | 0fa914c632210e09940f0bf5b85d2329b75e04e0 (diff) | |
| parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) | |
Merge commit 'v3.1-rc6' into core/locking
Merge reason: We are queueing up locking annotation patches, move to a fresh base
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/openrisc/include/asm/sigcontext.h')
| -rw-r--r-- | arch/openrisc/include/asm/sigcontext.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/openrisc/include/asm/sigcontext.h b/arch/openrisc/include/asm/sigcontext.h index 54a5c50132e3..b79c2b19afbe 100644 --- a/arch/openrisc/include/asm/sigcontext.h +++ b/arch/openrisc/include/asm/sigcontext.h @@ -23,16 +23,11 @@ /* This struct is saved by setup_frame in signal.c, to keep the current context while a signal handler is executed. It's restored by sys_sigreturn. - - To keep things simple, we use pt_regs here even though normally you just - specify the list of regs to save. Then we can use copy_from_user on the - entire regs instead of a bunch of get_user's as well... */ struct sigcontext { - struct pt_regs regs; /* needs to be first */ + struct user_regs_struct regs; /* needs to be first */ unsigned long oldmask; - unsigned long usp; /* usp before stacking this gunk on it */ }; #endif /* __ASM_OPENRISC_SIGCONTEXT_H */ |