diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:17:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:17:50 +0800 |
| commit | d2a15c13d6db9745a496a89025f665445b586ff2 (patch) | |
| tree | 00cd710425a9354bc46fe42bd4320e121d92647a /arch/x86/kernel/head_32.S | |
| parent | 66e16b528a0b76260617552fce9c44fecb8b51fe (diff) | |
| parent | a057484ab40ff81f22a94bb62c035c78b5abd940 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-16.12-rt
Diffstat (limited to 'arch/x86/kernel/head_32.S')
| -rw-r--r-- | arch/x86/kernel/head_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 6bc9ae24b6d2..8f1a3f443f7d 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -571,7 +571,7 @@ early_idt_handler_common: movl %eax,%ds movl %eax,%es - cmpl $(__KERNEL_CS),32(%esp) + cmpw $(__KERNEL_CS),32(%esp) jne 10f leal 28(%esp),%eax # Pointer to %eip |