diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 13:29:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 13:29:01 -0400 |
| commit | 1e4b978154c8cb6cdadd1988c597ef20f837679e (patch) | |
| tree | 67c33602bb3125c3957a441fa912044f55ccfc57 /arch | |
| parent | ce8a7424d23a36f043d0de8484f888971c831119 (diff) | |
| parent | b48ccb095a0c9257241261ec2bd1cbb1bdabc48b (diff) | |
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) | |||
| 1410 | paranoid_swapgs: | 1410 | paranoid_swapgs: |
| 1411 | TRACE_IRQS_IRETQ 0 | 1411 | TRACE_IRQS_IRETQ 0 |
| 1412 | SWAPGS_UNSAFE_STACK | 1412 | SWAPGS_UNSAFE_STACK |
| 1413 | RESTORE_ALL 8 | ||
| 1414 | jmp irq_return | ||
| 1413 | paranoid_restore: | 1415 | paranoid_restore: |
| 1416 | TRACE_IRQS_IRETQ 0 | ||
| 1414 | RESTORE_ALL 8 | 1417 | RESTORE_ALL 8 |
| 1415 | jmp irq_return | 1418 | jmp irq_return |
| 1416 | paranoid_userspace: | 1419 | paranoid_userspace: |