From 68d6296c44c5c607017ed37ae603a684bebb7051 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 1 Feb 2008 17:49:42 +0100
Subject: [PATCH] --- yaml --- r: 82015 b: refs/heads/master c:
 c72258c7c9de448d5ea826ec6b4737eccbaa6718 h: refs/heads/master i:   82013:
 50db3fe7e3585c44a35c71bda0798b04ea7851ed   82011:
 7af0c95df51c0b00f9ead4bebd5ea07f77c18bc2   82007:
 66bb3c1f869e548f826cf638b93959c8aee845d1   81999:
 d1d53cabb21b90c2da2f6a62262e4b1c833afe38   81983:
 2e6157e45588ebeeeab40cffc59e9ac6d814411f v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/cpuid.c     | 2 +-
 trunk/arch/x86/kernel/microcode.c | 2 +-
 trunk/arch/x86/kernel/msr.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b8822e5abdbe..975bc7f77176 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69e97c028b25ef10018d513ead6e7caad276e19f
+refs/heads/master: c72258c7c9de448d5ea826ec6b4737eccbaa6718
diff --git a/trunk/arch/x86/kernel/cpuid.c b/trunk/arch/x86/kernel/cpuid.c
index dec66e452810..a63432d800f9 100644
--- a/trunk/arch/x86/kernel/cpuid.c
+++ b/trunk/arch/x86/kernel/cpuid.c
@@ -170,7 +170,7 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
 	return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata cpuid_class_cpu_notifier =
+static struct notifier_block __refdata cpuid_class_cpu_notifier =
 {
 	.notifier_call = cpuid_class_cpu_callback,
 };
diff --git a/trunk/arch/x86/kernel/microcode.c b/trunk/arch/x86/kernel/microcode.c
index 6ff447f9fda7..f2702d01b8a8 100644
--- a/trunk/arch/x86/kernel/microcode.c
+++ b/trunk/arch/x86/kernel/microcode.c
@@ -797,7 +797,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
 	return NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata mc_cpu_notifier = {
+static struct notifier_block __refdata mc_cpu_notifier = {
 	.notifier_call = mc_cpu_callback,
 };
 
diff --git a/trunk/arch/x86/kernel/msr.c b/trunk/arch/x86/kernel/msr.c
index 21f6e3c0be18..bd82850e6519 100644
--- a/trunk/arch/x86/kernel/msr.c
+++ b/trunk/arch/x86/kernel/msr.c
@@ -168,7 +168,7 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
 	return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata msr_class_cpu_notifier = {
+static struct notifier_block __refdata msr_class_cpu_notifier = {
 	.notifier_call = msr_class_cpu_callback,
 };