Change sysenter_setup to __cpuinit. Add __CPUINIT & __CPUINITDATA. Resolve MODPOST warnings similar to: WARNING: vmlinux - Section mismatch: reference to .init.text:sysenter_setup from .text between 'identify_cpu' (at offset 0xc040a380) and 'detect_ht' and WARNING: vmlinux - Section mismatch: reference to .init.data:vsyscall_int80_end from .text between 'sysenter_setup' (at offset 0xc041a269) and 'enable_sep_cpu' WARNING: vmlinux - Section mismatch: reference to .init.data:vsyscall_int80_start from .text between 'sysenter_setup' (at offset 0xc041a26e) and 'enable_sep_cpu' WARNING: vmlinux - Section mismatch: reference to .init.data:vsyscall_sysenter_end from .text between 'sysenter_setup' (at offset 0xc041a275) and 'enable_sep_cpu' WARNING: vmlinux - Section mismatch: reference to .init.data:vsyscall_sysenter_start from .text between 'sysenter_setup' (at offset 0xc041a27a) and 'enable_sep_cpu' Signed-off-by: Prarit Bhargava diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c index 13ca54a..168f814 100644 --- a/arch/i386/kernel/sysenter.c +++ b/arch/i386/kernel/sysenter.c @@ -72,7 +72,7 @@ extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; static struct page *syscall_pages[1]; -int __init sysenter_setup(void) +int __cpuinit sysenter_setup(void) { void *syscall_page = (void *)get_zeroed_page(GFP_ATOMIC); syscall_pages[0] = virt_to_page(syscall_page); diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S index 598a4d0..d3e3db3 100644 --- a/arch/x86_64/kernel/head.S +++ b/arch/x86_64/kernel/head.S @@ -324,9 +324,7 @@ ENTRY(wakeup_level4_pgt) .quad phys_level3_kernel_pgt | 0x007 #endif -#ifndef CONFIG_HOTPLUG_CPU - __INITDATA -#endif + __CPUINITDATA /* * This default setting generates an ident mapping at address 0x100000 * and a mapping for the kernel that precisely maps virtual address diff --git a/include/linux/init.h b/include/linux/init.h index e290a01..6592357 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -56,6 +56,14 @@ #define __FINIT .previous #define __INITDATA .section ".init.data","aw" +#ifdef CONFIG_HOTPLUG_CPU +#define __CPUINIT .section ".text","ax" +#define __CPUINITDATA .section ".data","ax" +#else +#define __CPUINIT __INIT +#define __CPUINITDATA __INITDATA +#endif + #ifndef __ASSEMBLY__ /* * Used for initialization calls..