diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:32:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:33:03 +0100 |
| commit | ef15eda98217f5183f457e7a2de8b79555ef908b (patch) | |
| tree | f8f22b48f7bb237c9aa6646175f3e17eeac4af0e /arch/x86/include/asm/sigframe.h | |
| parent | 5cb4ac3a583d4ee18c8682ab857e093c4a0d0895 (diff) | |
| parent | ef334a20d84f52407a8a2afd02ddeaecbef0ad3d (diff) | |
| download | op-kernel-dev-ef15eda98217f5183f457e7a2de8b79555ef908b.zip op-kernel-dev-ef15eda98217f5183f457e7a2de8b79555ef908b.tar.gz | |
Merge branch 'x86/cleanups' into perf/uprobes
Merge reason: We want to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/sigframe.h')
| -rw-r--r-- | arch/x86/include/asm/sigframe.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h index 4e0fe26..7c7c27c 100644 --- a/arch/x86/include/asm/sigframe.h +++ b/arch/x86/include/asm/sigframe.h @@ -59,12 +59,25 @@ struct rt_sigframe_ia32 { #endif /* defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) */ #ifdef CONFIG_X86_64 + struct rt_sigframe { char __user *pretcode; struct ucontext uc; struct siginfo info; /* fp state follows here */ }; + +#ifdef CONFIG_X86_X32_ABI + +struct rt_sigframe_x32 { + u64 pretcode; + struct ucontext_x32 uc; + compat_siginfo_t info; + /* fp state follows here */ +}; + +#endif /* CONFIG_X86_X32_ABI */ + #endif /* CONFIG_X86_64 */ #endif /* _ASM_X86_SIGFRAME_H */ |
