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 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
trampoline_32.S
diff --git
a/arch/x86/kernel/trampoline_32.S
b/arch/x86/kernel/trampoline_32.S
index 66d874e5404cec797dbdab2fae1a84558ecbc50a..8508237e8e43634c6ec70c41302922d301cef512 100644
(file)
--- a/
arch/x86/kernel/trampoline_32.S
+++ b/
arch/x86/kernel/trampoline_32.S
@@
-28,16
+28,12
@@
*/
#include <linux/linkage.h>
*/
#include <linux/linkage.h>
+#include <linux/init.h>
#include <asm/segment.h>
#include <asm/page_types.h>
/* We can free up trampoline after bootup if cpu hotplug is not supported. */
#include <asm/segment.h>
#include <asm/page_types.h>
/* We can free up trampoline after bootup if cpu hotplug is not supported. */
-#ifndef CONFIG_HOTPLUG_CPU
-.section ".cpuinit.data","aw",@progbits
-#else
-.section .rodata,"a",@progbits
-#endif
-
+__CPUINITRODATA
.code16
ENTRY(trampoline_data)
.code16
ENTRY(trampoline_data)