diff --git a/[refs] b/[refs] index 0961d3a5704e..6ea73ef2fb94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a13db56624c2a9d6c0dae0a693b25b0e58de9ea3 +refs/heads/master: d92de65cab5980c16d4a1c326c1ef9a591892883 diff --git a/trunk/arch/i386/kernel/head.S b/trunk/arch/i386/kernel/head.S index e966fc8c44c4..4477bb107098 100644 --- a/trunk/arch/i386/kernel/head.S +++ b/trunk/arch/i386/kernel/head.S @@ -299,7 +299,6 @@ is386: movl $2,%ecx # set MP movl %eax,%cr0 call check_x87 - incb ready lgdt cpu_gdt_descr lidt idt_descr ljmp $(__KERNEL_CS),$1f @@ -316,8 +315,9 @@ is386: movl $2,%ecx # set MP lldt %ax cld # gcc2 wants the direction flag cleared at all times #ifdef CONFIG_SMP - movb ready, %cl - cmpb $1,%cl + movb ready, %cl + movb $1, ready + cmpb $0,%cl je 1f # the first CPU calls start_kernel # all other CPUs call initialize_secondary call initialize_secondary