From ddb67dd27075f66bea76b120e1cefc711d819bf6 Mon Sep 17 00:00:00 2001
From: Satyam Sharma <satyam@infradead.org>
Date: Wed, 17 Oct 2007 18:04:36 +0200
Subject: [PATCH] --- yaml --- r: 70975 b: refs/heads/master c:
 761c4bf821b67334e2391ef968396069b91801b7 h: refs/heads/master i:   70973:
 2cee249b0472f6da40aef0a8b8bb3dbc288f0115   70971:
 e9074f9bc0786f79ca8bdc628da5e23961b0b05f   70967:
 6a146fd08e9fa4cdb14e09d4a979ec1043317daa   70959:
 2c88322bba5494ad223cc738a15f7ea6f9671ee1   70943:
 dda4f1c6fa87ea6bd6475ba52d0dd24e67656b71   70911:
 47c2e5fc20088536f3bc8aaeeb4701d2be2d8eb2 v: v3

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

diff --git a/[refs] b/[refs]
index f0405ebe23e9..79d020661203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e3808b67f88cdd8c531dda3e00deb3623a3dac
+refs/heads/master: 761c4bf821b67334e2391ef968396069b91801b7
diff --git a/trunk/arch/x86/kernel/msr.c b/trunk/arch/x86/kernel/msr.c
index c044de310b69..df85c9c13601 100644
--- a/trunk/arch/x86/kernel/msr.c
+++ b/trunk/arch/x86/kernel/msr.c
@@ -133,7 +133,7 @@ static const struct file_operations msr_fops = {
 	.open = msr_open,
 };
 
-static int msr_device_create(int i)
+static int __cpuinit msr_device_create(int i)
 {
 	int err = 0;
 	struct device *dev;
@@ -144,7 +144,7 @@ static int msr_device_create(int i)
 	return err;
 }
 
-static int msr_class_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
 				unsigned long action, void *hcpu)
 {
 	unsigned int cpu = (unsigned long)hcpu;