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

[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
...@@ -168,7 +168,7 @@ static int cpuid_class_device_create(int i) ...@@ -168,7 +168,7 @@ static int cpuid_class_device_create(int i)
return err; 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; unsigned int cpu = (unsigned long)hcpu;
......
...@@ -251,7 +251,7 @@ static int msr_class_device_create(int i) ...@@ -251,7 +251,7 @@ static int msr_class_device_create(int i)
return err; 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; unsigned int cpu = (unsigned long)hcpu;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment