diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-24 10:43:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-24 10:43:24 +1000 |
| commit | d5c5e280c239cb178cfeabcfcf1d620fe88982be (patch) | |
| tree | cbf5a363ccadd685b330120e2be15f023f666f9e /arch | |
| parent | aa52abd45c0564b7ce900ed73304072b68d90893 (diff) | |
| parent | 18943b513d3aacdf0c2965efd46f8271756e22a2 (diff) | |
Merge commit 'tip-core/auto-core-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/thread_info_64.h | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h index 639ac805448a..65865726b283 100644 --- a/arch/sparc/include/asm/thread_info_64.h +++ b/arch/sparc/include/asm/thread_info_64.h @@ -102,8 +102,8 @@ struct thread_info { #define TI_KERN_CNTD1 0x00000488 #define TI_PCR 0x00000490 #define TI_RESTART_BLOCK 0x00000498 -#define TI_KUNA_REGS 0x000004c0 -#define TI_KUNA_INSN 0x000004c8 +#define TI_KUNA_REGS 0x000004c8 +#define TI_KUNA_INSN 0x000004d0 #define TI_FPREGS 0x00000500 /* We embed this in the uppermost byte of thread_info->flags */ diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index a331ec38af9e..38946c6e8433 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1410,7 +1410,10 @@ ENTRY(paranoid_exit) paranoid_swapgs: TRACE_IRQS_IRETQ 0 SWAPGS_UNSAFE_STACK + RESTORE_ALL 8 + jmp irq_return paranoid_restore: + TRACE_IRQS_IRETQ 0 RESTORE_ALL 8 jmp irq_return paranoid_userspace: |