projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
head_32.S
diff --git
a/arch/x86/kernel/head_32.S
b/arch/x86/kernel/head_32.S
index 463c9797ca6ab5f392bc65c6fbe1c1ddfc699c18..d42ab17b739729c4b27d3f3fe02fdea2633f2f5a 100644
(file)
--- a/
arch/x86/kernel/head_32.S
+++ b/
arch/x86/kernel/head_32.S
@@
-274,10
+274,7
@@
num_subarch_entries = (. - subarch_entries) / 4
* If cpu hotplug is not supported then this code can go in init section
* which will be freed later
*/
* If cpu hotplug is not supported then this code can go in init section
* which will be freed later
*/
-
__CPUINIT
__CPUINIT
-
-#ifdef CONFIG_SMP
ENTRY(startup_32_smp)
cld
movl $(__BOOT_DS),%eax
ENTRY(startup_32_smp)
cld
movl $(__BOOT_DS),%eax
@@
-288,7
+285,7
@@
ENTRY(startup_32_smp)
movl pa(stack_start),%ecx
movl %eax,%ss
leal -__PAGE_OFFSET(%ecx),%esp
movl pa(stack_start),%ecx
movl %eax,%ss
leal -__PAGE_OFFSET(%ecx),%esp
-#endif /* CONFIG_SMP */
+
default_entry:
/*
default_entry:
/*