: Change sysenter_setup to __cpuinit & improve __INIT, __INITDATA
PATCH 1/1 : Change sysenter_setup to __cpuinit & improve __INIT, __INITDATA
Change sysenter_setup to __cpuinit.
Change __INIT & __INITDATA to be cpu hotplug aware.
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'
arch/i386/kernel/sysenter.c +1 -1
@@ -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);
include/linux/init.h +6 -1
@@ -52,9 +52,14 @@#endif /* For assembly routines */ +#ifdef CONFIG_HOTPLUG_CPU +#define __INIT .section ".text","ax" +#define __INITDATA .section ".data","aw" +#else #define __INIT .section ".init.text","ax" -#define __FINIT .previous#define __INITDATA .section ".init.data","aw" +#endif +#define __FINIT .previous#ifndef __ASSEMBLY__/*
include/linux/init.h line 64
Quoted 12 lines · Prarit Bhargava
/* For assembly routines */
include/linux/init.h +6
-1+#ifdef CONFIG_HOTPLUG_CPU +#define __INIT .section ".text","ax" +#define __INITDATA .section ".data","aw" +#else #define __INIT .section ".init.text","ax" -#define __FINIT .previous#define __INITDATA .section ".init.data","aw" +#endif +#define __FINIT .previous#ifndef __ASSEMBLY__
Shouldn't this be __CPUINT/__CPUINITDATA? That way you could also get rid of things like in x86_64 head.S;
#ifndef CONFIG_HOTPLUG_CPU
__INITDATA
#endif
Quoted 6 lines · Zwane Mwaikambo
Shouldn't this be __CPUINT/__CPUINITDATA? That way you could also get rid of things like in
x86_64head.S;#ifndef
CONFIG_HOTPLUG_CPU
__INITDATA
#endif
Zwane -- good point. New patch.
P.
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'
arch/i386/kernel/sysenter.c +1 -1
@@ -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);
arch/x86_64/kernel/head.S +1 -3
@@ -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
include/linux/init.h +8 -0
@@ -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..