diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-07-10 11:45:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-07-10 11:45:22 +0200 |
| commit | bc916e67c0eeb734fa877e63128db3d2352508f4 (patch) | |
| tree | 530a19cda8cc36f7662d1ed417abd32d1e75cbfd /arch/x86/kernel/traps.c | |
| parent | b037b09b9058d84882fa2c4db3806433e2b0f912 (diff) | |
| parent | bd87e6f6610aa96fde01ee6653e162213f7ec836 (diff) | |
Merge branch 'x86/urgent' into x86/entry to pick up upstream fixes.
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 4627f826fb57..ab6828e360f2 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -303,6 +303,8 @@ DEFINE_IDTENTRY_ERRORCODE(exc_alignment_check) do_trap(X86_TRAP_AC, SIGBUS, "alignment check", regs, error_code, BUS_ADRALN, NULL); + + local_irq_disable(); } #ifdef CONFIG_VMAP_STACK |