Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
x86: fix cpu hotplug on 32bit

+5 -3
+5 -3
arch/x86/kernel/head_32.S
··· 456 456 1: 457 457 #endif /* CONFIG_SMP */ 458 458 jmp *(initial_code) 459 - .align 4 460 - ENTRY(initial_code) 461 - .long i386_start_kernel 462 459 463 460 /* 464 461 * We depend on ET to be correct. This checks for 287/387. ··· 597 600 popl %eax 598 601 #endif 599 602 iret 603 + 604 + .section .cpuinit.data,"wa" 605 + .align 4 606 + ENTRY(initial_code) 607 + .long i386_start_kernel 600 608 601 609 .section .text 602 610 /*