diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:41 +0100 |
| commit | e898c6706869fdcbd68b1e7fb0ac7461d98710fe (patch) | |
| tree | 28054da88ddda324f78f27083b14328113941fbc /arch/x86/include/asm/processor.h | |
| parent | c94082656dac74257f63e91f78d5d458ac781fa5 (diff) | |
| parent | 55283e2537714f9370c4ab847d170acf223daf90 (diff) | |
| download | linux-3.10-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.tar.gz linux-3.10-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.tar.bz2 linux-3.10-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.zip | |
Merge branch 'x86/x32' into x86/cleanups
Merge reason: We are going to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 58545c97d07..02ce0b37964 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -926,9 +926,9 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \ 0xc0000000 : 0xFFFFe000) -#define TASK_SIZE (test_thread_flag(TIF_IA32) ? \ +#define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \ IA32_PAGE_OFFSET : TASK_SIZE_MAX) -#define TASK_SIZE_OF(child) ((test_tsk_thread_flag(child, TIF_IA32)) ? \ +#define TASK_SIZE_OF(child) ((test_tsk_thread_flag(child, TIF_ADDR32)) ? \ IA32_PAGE_OFFSET : TASK_SIZE_MAX) #define STACK_TOP TASK_SIZE @@ -950,6 +950,12 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); #define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1) extern unsigned long KSTK_ESP(struct task_struct *task); + +/* + * User space RSP while inside the SYSCALL fast path + */ +DECLARE_PER_CPU(unsigned long, old_rsp); + #endif /* CONFIG_X86_64 */ extern void start_thread(struct pt_regs *regs, unsigned long new_ip, |