diff options
| author | Ashok Raj <Ashok.Raj@intel.com> | 2006-02-03 21:51:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 16:43:14 -0800 |
| commit | 7ded56895c11a656408b6ff21086ae04a6a7cda0 (patch) | |
| tree | e12b7105ee50a86573594b803e55270abf5dbc3c | |
| parent | 396bd50fed9c91f7aa1ac66f4b2880ca58c332ff (diff) | |
| download | op-kernel-dev-7ded56895c11a656408b6ff21086ae04a6a7cda0.zip op-kernel-dev-7ded56895c11a656408b6ff21086ae04a6a7cda0.tar.gz | |
[PATCH] x86_64: data/functions wrongly marked as __init with cpu hotplug.
attached patch is 2 more cases i found via running the reference_init.pl
script. These were easy to spot just knowing the file names. There is
one another about init/main.c that i cant exactly zero in. (partly
because i dont know how to interpret the data thats spewed out of the tool).
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/x86_64/kernel/mce.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/processor_idle.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c index 13a2ead..b8b9529 100644 --- a/arch/x86_64/kernel/mce.c +++ b/arch/x86_64/kernel/mce.c @@ -380,7 +380,7 @@ static void __cpuinit mce_cpu_features(struct cpuinfo_x86 *c) */ void __cpuinit mcheck_init(struct cpuinfo_x86 *c) { - static cpumask_t mce_cpus __initdata = CPU_MASK_NONE; + static cpumask_t mce_cpus = CPU_MASK_NONE; mce_cpu_quirks(c); diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 3bfca09..eb730a8 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -94,7 +94,9 @@ static int set_max_cstate(struct dmi_system_id *id) return 0; } -static struct dmi_system_id __initdata processor_power_dmi_table[] = { +/* Actually this shouldn't be __cpuinitdata, would be better to fix the + callers to only run once -AK */ +static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = { { set_max_cstate, "IBM ThinkPad R40e", { DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1}, |
