diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
| commit | c0bb80cfa3c37fd92f066e328d83656067519a5f (patch) | |
| tree | fad29579615daaf7d36364e4b45702db0c709044 /arch/x86/mm | |
| parent | adfaf18334cbf16c563e4ebc67e968ea1b17ec51 (diff) | |
| parent | ecda85e70277ef24e44a1f6bc00243cebd19f985 (diff) | |
| download | linux-stable-c0bb80cfa3c37fd92f066e328d83656067519a5f.tar.gz linux-stable-c0bb80cfa3c37fd92f066e328d83656067519a5f.tar.bz2 linux-stable-c0bb80cfa3c37fd92f066e328d83656067519a5f.zip | |
Merge branch 'x86/asm' into x86/apic
Pick up dependent changes to avoid merge conflicts
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/extable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 0ea8afcb929c..fb2ddcdf7c73 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -142,7 +142,7 @@ void __init early_fixup_exception(struct pt_regs *regs, int trapnr) * undefined. I'm not sure which CPUs do this, but at least * the 486 DX works this way. */ - if ((regs->cs & 0xFFFF) != __KERNEL_CS) + if (regs->cs != __KERNEL_CS) goto fail; /* |