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
This commit is contained in:
commit
fb4284b2b7
|
@ -456,9 +456,6 @@ is386: movl $2,%ecx # set MP
|
||||||
1:
|
1:
|
||||||
#endif /* CONFIG_SMP */
|
#endif /* CONFIG_SMP */
|
||||||
jmp *(initial_code)
|
jmp *(initial_code)
|
||||||
.align 4
|
|
||||||
ENTRY(initial_code)
|
|
||||||
.long i386_start_kernel
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We depend on ET to be correct. This checks for 287/387.
|
* We depend on ET to be correct. This checks for 287/387.
|
||||||
|
@ -601,6 +598,11 @@ ignore_int:
|
||||||
#endif
|
#endif
|
||||||
iret
|
iret
|
||||||
|
|
||||||
|
.section .cpuinit.data,"wa"
|
||||||
|
.align 4
|
||||||
|
ENTRY(initial_code)
|
||||||
|
.long i386_start_kernel
|
||||||
|
|
||||||
.section .text
|
.section .text
|
||||||
/*
|
/*
|
||||||
* Real beginning of normal "text" segment
|
* Real beginning of normal "text" segment
|
||||||
|
|
Loading…
Reference in New Issue