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

Commit efe87d2b authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

[PATCH] x86 cpuid and msr notifier callback section mismatches 



Fix section mismatch warnings in x86 cpuid and msr notifier callback
functions.  We can't have these as init (discarded) code.

WARNING: arch/x86_64/kernel/cpuid.o - Section mismatch: reference to .init.text: from .data between 'cpuid_class_cpu_notifier' (at offset 0x0) and 'cpuid_fops'
WARNING: arch/x86_64/kernel/msr.o - Section mismatch: reference to .init.text: from .data between 'msr_class_cpu_notifier' (at offset 0x0) and 'msr_fops'

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1bb858f2

arch/i386/kernel/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int cpuid_class_device_create(int i) 
	return err;

}



static int __devinit cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)

static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;

arch/i386/kernel/msr.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static int msr_class_device_create(int i) 
	return err;

}



static int __devinit msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)

static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;