diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 10:29:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 10:29:01 -0700 |
| commit | 1e4b978154c8cb6cdadd1988c597ef20f837679e (patch) | |
| tree | 67c33602bb3125c3957a441fa912044f55ccfc57 /arch | |
| parent | sparc: convert to use __HEAD and HEAD_TEXT macros. (diff) | |
| parent | locking: clarify kernel-taint warning message (diff) | |
| download | linux-dev-1e4b978154c8cb6cdadd1988c597ef20f837679e.tar.xz linux-dev-1e4b978154c8cb6cdadd1988c597ef20f837679e.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
locking: clarify kernel-taint warning message
lockdep, x86: account for irqs enabled in paranoid_exit
lockdep: more robust lockdep_map init sequence
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 3 |
1 files changed, 3 insertions, 0 deletions
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: |