diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-12 11:02:50 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-12 11:02:50 +0200 |
| commit | 331b57d14829c49d75076779cdc54d7e4537bbf0 (patch) | |
| tree | 79a70eadb04ed2fd65d3280021ec6ad5266d1cc1 /arch/x86/kernel/traps.c | |
| parent | 79761ce80aa0232157e428bde28c0cef6d43ac5f (diff) | |
| parent | e43b3b58548051f8809391eb7bec7a27ed3003ea (diff) | |
Merge branch 'irq/urgent' into x86/apic
Pick up core changes which affect the vector rework.
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 321240f712e1..a5791f3d3f84 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -142,7 +142,7 @@ void ist_begin_non_atomic(struct pt_regs *regs) * from double_fault. */ BUG_ON((unsigned long)(current_top_of_stack() - - current_stack_pointer()) >= THREAD_SIZE); + current_stack_pointer) >= THREAD_SIZE); preempt_enable_no_resched(); } |