Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
kernel
/
head_32.S
diff --git
a/kernel/arch/x86/kernel/head_32.S
b/kernel/arch/x86/kernel/head_32.S
index
7e429c9
..
8f1a3f4
100644
(file)
--- a/
kernel/arch/x86/kernel/head_32.S
+++ b/
kernel/arch/x86/kernel/head_32.S
@@
-152,7
+152,7
@@
ENTRY(startup_32)
movl %eax, pa(olpc_ofw_pgd)
#endif
movl %eax, pa(olpc_ofw_pgd)
#endif
-#ifdef CONFIG_MICROCODE
_EARLY
+#ifdef CONFIG_MICROCODE
/* Early load ucode on BSP. */
call load_ucode_bsp
#endif
/* Early load ucode on BSP. */
call load_ucode_bsp
#endif
@@
-311,12
+311,11
@@
ENTRY(startup_32_smp)
movl %eax,%ss
leal -__PAGE_OFFSET(%ecx),%esp
movl %eax,%ss
leal -__PAGE_OFFSET(%ecx),%esp
-#ifdef CONFIG_MICROCODE
_EARLY
+#ifdef CONFIG_MICROCODE
/* Early load ucode on AP. */
call load_ucode_ap
#endif
/* Early load ucode on AP. */
call load_ucode_ap
#endif
-
default_entry:
#define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \
X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \
default_entry:
#define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \
X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \
@@
-557,7
+556,7
@@
early_idt_handler_common:
cld
cmpl $2,(%esp) # X86_TRAP_NMI
cld
cmpl $2,(%esp) # X86_TRAP_NMI
- je
is_nmi
# Ignore NMI
+ je
.Lis_nmi
# Ignore NMI
cmpl $2,%ss:early_recursion_flag
je hlt_loop
cmpl $2,%ss:early_recursion_flag
je hlt_loop
@@
-572,7
+571,7
@@
early_idt_handler_common:
movl %eax,%ds
movl %eax,%es
movl %eax,%ds
movl %eax,%es
- cmp
l
$(__KERNEL_CS),32(%esp)
+ cmp
w
$(__KERNEL_CS),32(%esp)
jne 10f
leal 28(%esp),%eax # Pointer to %eip
jne 10f
leal 28(%esp),%eax # Pointer to %eip
@@
-610,7
+609,7
@@
ex_entry:
pop %ecx
pop %eax
decl %ss:early_recursion_flag
pop %ecx
pop %eax
decl %ss:early_recursion_flag
-is_nmi:
+
.L
is_nmi:
addl $8,%esp /* drop vector number and error code */
iret
ENDPROC(early_idt_handler_common)
addl $8,%esp /* drop vector number and error code */
iret
ENDPROC(early_idt_handler_common)