diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-11-24 11:55:11 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-11-24 11:55:11 +0300 |
| commit | 49b24106315ddf7b024cf6d289e2ff5c2c7a69fc (patch) | |
| tree | 693f95c777495e243f32f75d3bfed034e5dc5c75 /arch/x86/entry | |
| parent | 75ef82190dceac3d84cdc209fdf82800a7cc6609 (diff) | |
| parent | f10750536fa783cafb2653f6fa349d6e62337e42 (diff) | |
| download | linux-49b24106315ddf7b024cf6d289e2ff5c2c7a69fc.tar.xz | |
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/entry_64.S | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 53616ca03244..a55697d19824 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -509,6 +509,17 @@ END(irq_entries_start) * tracking that we're in kernel mode. */ SWAPGS + + /* + * We need to tell lockdep that IRQs are off. We can't do this until + * we fix gsbase, and we should do it before enter_from_user_mode + * (which can take locks). Since TRACE_IRQS_OFF idempotent, + * the simplest way to handle it is to just call it twice if + * we enter from user mode. There's no reason to optimize this since + * TRACE_IRQS_OFF is a no-op if lockdep is off. + */ + TRACE_IRQS_OFF + #ifdef CONFIG_CONTEXT_TRACKING call enter_from_user_mode #endif @@ -1049,12 +1060,18 @@ ENTRY(error_entry) SWAPGS .Lerror_entry_from_usermode_after_swapgs: + /* + * We need to tell lockdep that IRQs are off. We can't do this until + * we fix gsbase, and we should do it before enter_from_user_mode + * (which can take locks). + */ + TRACE_IRQS_OFF #ifdef CONFIG_CONTEXT_TRACKING call enter_from_user_mode #endif + ret .Lerror_entry_done: - TRACE_IRQS_OFF ret |