Skip to contentSkip to conversation

microcode: Fix mc_cpu_notifier section warning

PATCH In review Jean Delvare 3 participants 5 messages Dec 17, 2006 – Dec 21, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 microcode: Fix mc_cpu_notifier section warning

Structure mc_cpu_notifier references a __cpuinit function, but isn't declared __cpuinitdata itself:

WARNING: arch/i386/kernel/microcode.o - Section mismatch: reference to .init.text: from .data after 'mc_cpu_notifier' (at offset 0x118)

---
 arch/i386/kernel/microcode.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/i386/kernel/microcode.c +1 -1
@@ -722,7 +722,7 @@
 	return NOTIFY_OK;
 }
 
-static struct notifier_block mc_cpu_notifier = {
+static struct notifier_block __cpuinitdata mc_cpu_notifier = {
 	.notifier_call = mc_cpu_callback,
 };
 
Signature · 1 line
Jean Delvare
#1 lore raw

Hi Jean,

Ok, your patch is correct, although I assume you realize that it does nothing --- both the function and the data it operates on are inside CONFIG_HOTPLUG_CPU and checking include/linux/init.h I see that __cpuinitdata is nothing in this case. E.g. msr_class_cpu_notifier in the msr driver isn't declared __cpuinitdata...

But to tidy up one should add __cpuinitdata as you suggest (to guard for the case if these two slip out of CONFIG_HOTPLUG_CPU, although they are meaningless if cpu hotplug support is not configured in).

Kind regards
Tigran

Quoted 27 lines · Jean Delvare

Structure mc_cpu_notifier references a __cpuinit function, but isn't declared __cpuinitdata itself:

WARNING: arch/i386/kernel/microcode.o - Section mismatch: reference to .init.text: from .data after 'mc_cpu_notifier' (at offset 0x118)

---
arch/i386/kernel/microcode.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
arch/i386/kernel/microcode.c +1 -1
@@ -722,7 +722,7 @@
 	return NOTIFY_OK;
 }
 
-static struct notifier_block mc_cpu_notifier = {
+static struct notifier_block __cpuinitdata mc_cpu_notifier = {
 	.notifier_call = mc_cpu_callback,
 };
 
Signature · 2 lines
-- 
Jean Delvare
#2 lore raw

Hi Tigran,

Quoted 5 lines · Tigran Aivazian

Ok, your patch is correct, although I assume you realize that it does nothing --- both the function and the data it operates on are inside CONFIG_HOTPLUG_CPU and checking include/linux/init.h I see that __cpuinitdata is nothing in this case. E.g. msr_class_cpu_notifier in the msr driver isn't declared __cpuinitdata...

I don't see anything in arch/i386/kernel/microcode.c depending on CONFIG_HOTPLUG_CPU (in 2.6.20-rc1), sorry.

Quoted 30 lines

But to tidy up one should add __cpuinitdata as you suggest (to guard for the case if these two slip out of CONFIG_HOTPLUG_CPU, although they are meaningless if cpu hotplug support is not configured in).

Kind regards
Tigran

Quoted 21 lines · Jean Delvare

Structure mc_cpu_notifier references a __cpuinit function, but isn't declared __cpuinitdata itself:

WARNING: arch/i386/kernel/microcode.o - Section mismatch: reference to .init.text: from .data after 'mc_cpu_notifier' (at offset 0x118)

---
arch/i386/kernel/microcode.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
arch/i386/kernel/microcode.c +1 -1
@@ -722,7 +722,7 @@
 	return NOTIFY_OK;
 }
 
-static struct notifier_block mc_cpu_notifier = {
+static struct notifier_block __cpuinitdata mc_cpu_notifier = {
 	.notifier_call = mc_cpu_callback,
 };
Signature · 1 line
Jean Delvare
#3 lore raw

Hi Jean,

Quoted 2 lines · Jean Delvare

I don't see anything in arch/i386/kernel/microcode.c depending on CONFIG_HOTPLUG_CPU (in 2.6.20-rc1), sorry.

I run 2.6.19.1 and there both mc_cpu_notifier (which your patch modified) and mc_cpu_callback (which uses mc_cpu_notifier) are inside #ifdef CONFIG_HOTPLUG_CPU.

Kind regards
Tigran

#4 lore raw
Quoted 9 lines · On Tue, 19 Dec 2006 09:10:25 +0000 (GMT) Tigran Aivazian…

Hi Jean,

Quoted 2 lines · Jean Delvare

I don't see anything in arch/i386/kernel/microcode.c depending on CONFIG_HOTPLUG_CPU (in 2.6.20-rc1), sorry.

I run 2.6.19.1 and there both mc_cpu_notifier (which your patch modified) and mc_cpu_callback (which uses mc_cpu_notifier) are inside #ifdef CONFIG_HOTPLUG_CPU.

Yes, we now compile this code unconditionally and rely upon the linker to throw it away.

Allegedly, this works. How toolchain-version-dependent it is I don't know.