From 101124957ea1c7a5c5c9aa24d955acb83a466f59 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 22 Nov 2008 17:36:44 +0000
Subject: [PATCH] --- yaml --- r: 119318 b: refs/heads/master c:
 8419641450edc838a6ce7cdf0f99d262bf0af2d5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e333fdbbcb56..989cf8da9fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0385146bcdd24b0390c2b60fd05a083888835db
+refs/heads/master: 8419641450edc838a6ce7cdf0f99d262bf0af2d5
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
index 5a732c5ef08b..8ea32e8d68b0 100644
--- a/trunk/kernel/cpu.c
+++ b/trunk/kernel/cpu.c
@@ -462,7 +462,7 @@ void __ref enable_nonboot_cpus(void)
  * It must be called by the arch code on the new cpu, before the new cpu
  * enables interrupts and before the "boot" cpu returns from __cpu_up().
  */
-void notify_cpu_starting(unsigned int cpu)
+void __cpuinit notify_cpu_starting(unsigned int cpu)
 {
 	unsigned long val = CPU_STARTING;
 
diff --git a/trunk/kernel/profile.c b/trunk/kernel/profile.c
index 5b7d1ac7124c..dc41827fbfee 100644
--- a/trunk/kernel/profile.c
+++ b/trunk/kernel/profile.c
@@ -351,7 +351,7 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
 	put_cpu();
 }
 
-static int __devinit profile_cpu_callback(struct notifier_block *info,
+static int __cpuinit profile_cpu_callback(struct notifier_block *info,
 					unsigned long action, void *__cpu)
 {
 	int node, cpu = (unsigned long)__cpu;
@@ -596,7 +596,7 @@ static int create_hash_tables(void)
 #define create_hash_tables()			({ 0; })
 #endif
 
-int create_proc_profile(void)
+int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */
 {
 	struct proc_dir_entry *entry;