diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:16:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:16:26 +0800 |
| commit | a057484ab40ff81f22a94bb62c035c78b5abd940 (patch) | |
| tree | 770ed007ccc70bee7e533a7fe532dd8a774b1457 /arch/x86/kernel | |
| parent | 3ba1692e7239293d7bc5a596ca9b0707f5bc07d5 (diff) | |
| parent | c95b7f1fab0c76882764a5196119237c8ad436ee (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
also change cpu_enable_uao in arch/arm64/include/asm/processor.h
comment unmatch fixed in arch/arm64/kernel/suspend.c
Diffstat (limited to 'arch/x86/kernel')
| -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 |