Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c0baf1 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Andi Kleen
Browse files

[PATCH] i386: 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'

Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent e319af1d

arch/i386/kernel/sysenter.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ extern const char vsyscall_int80_start, vsyscall_int80_end; 
extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;

extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;

static struct page *syscall_pages[1];

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);

	void *syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);

	syscall_pages[0] = virt_to_page(syscall_page);

	syscall_pages[0] = virt_to_page(syscall_page);

include/linux/init.h

+6 −1
Original line number Original line Diff line number Diff line
@@ -52,9 +52,14 @@ 
#endif

#endif





/* For assembly routines */

/* 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 __INIT		.section	".init.text","ax"

#define __FINIT		.previous

#define __INITDATA	.section	".init.data","aw"

#define __INITDATA	.section	".init.data","aw"

#endif

#define __FINIT		.previous





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

/*

/*