drivers/input/misc/wistron_btns.c: section fixes
Subsystems (2)
PATCH 1/1 drivers/input/misc/wistron_btns.c: section fixes
This patch contains the following fixes:
- it doesn't make sense to mark a variable on the stack as __initdata
- struct dmi_ids is using the __init dmi_matched()
since the only user of struct dmi_ids is the __init select_keymap(), the solution is to make struct dmi_ids __initdata
---
drivers/input/misc/wistron_btns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/misc/wistron_btns.c renamed from drivers/input/misc/wistron_btns.c.old +2 -2
@@ -94,7 +94,7 @@static ssize_t __init locate_wistron_bios (void __iomem *base) { -static const unsigned char __initdata signature[] = +static const unsigned char signature[] = {0x42 ,0x21 ,0x55 ,0x30 };ssize_t offset;
@@ -333,7 +333,7 @@* a list of buttons and their key codes (reported when loading this module * with force=1) and the output of dmidecode to $MODULE_AUTHOR. */ -static struct dmi_system_id dmi_ids[] = { +static struct dmi_system_id __initdata dmi_ids[] = { { .callback = dmi_matched, .ident ="Fujitsu-Siemens Amilo Pro V2000" ,
Quoted 3 lines · Adrian Bunk
This patch contains the following fixes:
- it doesn't make sense to mark a variable on the stack as__initdata
- structdmi_idsis using the__initdmi_matched()
Since when did static variables become allocated on stack?
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerQuoted 7 lines · Dmitry Torokhov
Quoted 3 lines · Adrian Bunk
This patch contains the following fixes:
- it doesn't make sense to mark a variable on the stack as__initdata
- structdmi_idsis using the__initdmi_matched()Since when did static variables become allocated on stack?
BTW, if I add __intidata to dmi_ids array GCC (3.4.4) bitches at me:
CC drivers/input/misc/wistron_btns.odrivers/input/misc/wistron_btns.c:345: error: dmi_ids causes a section type conflict
make[1]: *** [drivers/input/misc/wistron_btns.o] Error 1
make: *** [drivers/input/misc/] Error 2
I have to declare it as "static const struct dmi_system_id __initdata dmi_ids[] = {..." for it to compile successfully, but there is a comment that we should not use const with __initdata. Although I checked the assembly oputput and const __initdata endes up in init.data section - exactly where we want it. Wierd...
Signature · 1 line
Dmitry
Quoted 6 lines · Dmitry Torokhov
Quoted 3 lines · Adrian Bunk
This patch contains the following fixes:
- it doesn't make sense to mark a variable on the stack as__initdata
- structdmi_idsis using the__initdmi_matched()Since when did static variables become allocated on stack?
Only when I miss the static...
Quoted 1 line
Dmitry
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed