tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds fb4284b2 3e318b5b

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