Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit efe87d2b822e42975b4da958c9d321cf89bfeb5a

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent 1bb858f27e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

arch/i386/kernel/cpuid.c
Diff comments   View file @ efe87d2
... ... @@ -168,7 +168,7 @@
168 168 return err;
169 169 }
170 170  
171   -static int __devinit cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
  171 +static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
172 172 {
173 173 unsigned int cpu = (unsigned long)hcpu;
174 174  
arch/i386/kernel/msr.c
Diff comments   View file @ efe87d2
... ... @@ -251,7 +251,7 @@
251 251 return err;
252 252 }
253 253  
254   -static int __devinit msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
  254 +static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
255 255 {
256 256 unsigned int cpu = (unsigned long)hcpu;
257 257