From: Satyam Sharma <satyam@infradead.org>
Date: Thu, 18 Oct 2007 10:06:38 +0000 (-0700)
Subject: x86 msr driver: Misc cpuinit annotations
X-Git-Tag: v2.6.24-rc1~334
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=38048983e14c0fb6324175fbaf2be1baa842f5ee;p=linux-2.6-omap-h63xx.git

x86 msr driver: Misc cpuinit annotations

msr_class_cpu_callback() can be marked __cpuinit, being the notifier callback
for a __cpuinitdata notifier_block.  So can be marked msr_device_create() too,
called only from the newly-__cpuinit msr_class_cpu_callback() or from
__init-marked msr_init().

Signed-off-by: Satyam Sharma <satyam@infradead.org>
Cc: Andi Kleen <ak@suse.de>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index e0d5e82e64b..e18e516cf54 100644
--- a/arch/x86/kernel/msr.c
+++ b/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 cpu)
+static int __cpuinit msr_device_create(int cpu)
 {
 	struct device *dev;