summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-27 16:46:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-27 16:46:51 -0700
commitfb4284b2b7cfaf3b89557667587cca90bddccc59 (patch)
tree81d1b76e7841b412a1d875d00ba10487617db8e3
parent3e318b5b55fafebd3a6e4dd3a00b79bfc0668675 (diff)
parent583323b9d2f624884a8c9563fb5a4d795f39ab07 (diff)
downloadlinux-fb4284b2b7cfaf3b89557667587cca90bddccc59.tar.bz2
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
-rw-r--r--arch/x86/kernel/head_32.S8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index f67e93441caf..a7010c3a377a 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -456,9 +456,6 @@ is386: movl $2,%ecx # set MP
1:
#endif /* CONFIG_SMP */
jmp *(initial_code)
-.align 4
-ENTRY(initial_code)
- .long i386_start_kernel
/*
* We depend on ET to be correct. This checks for 287/387.
@@ -601,6 +598,11 @@ ignore_int:
#endif
iret
+.section .cpuinit.data,"wa"
+.align 4
+ENTRY(initial_code)
+ .long i386_start_kernel
+
.section .text
/*
* Real beginning of normal "text" segment