From 447814d5a30bac67358436eda0f30a1121b6c2ee Mon Sep 17 00:00:00 2001
From: Ashok Raj <Ashok.Raj@intel.com>
Date: Fri, 3 Feb 2006 21:51:23 +0100
Subject: [PATCH] --- yaml --- r: 19775 b: refs/heads/master c:
 7ded56895c11a656408b6ff21086ae04a6a7cda0 h: refs/heads/master i:   19773:
 29380be579f156c1ebf06a6f98ecb8ed797290aa   19771:
 8de75f75b53bf92f59da0b5197dba22bb92ac713   19767:
 59a3d3329c221cf8a0e9534fe9e0b3be26257270   19759:
 10472f0deec320505bc46c7ad69b2b7ba9bd7743   19743:
 d38e4631e9383cd048344b6ae5dd7b3bef924cca   19711:
 50248d81cf2bd0d329cff757464c69e4168b8091 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86_64/kernel/mce.c      | 2 +-
 trunk/drivers/acpi/processor_idle.c | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ecb21f876098..442afa92fa3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 396bd50fed9c91f7aa1ac66f4b2880ca58c332ff
+refs/heads/master: 7ded56895c11a656408b6ff21086ae04a6a7cda0
diff --git a/trunk/arch/x86_64/kernel/mce.c b/trunk/arch/x86_64/kernel/mce.c
index 13a2eada6c95..b8b9529fa89e 100644
--- a/trunk/arch/x86_64/kernel/mce.c
+++ b/trunk/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/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index 3bfca093a870..eb730a80952c 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/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},