From b51f7d7bc54681486e98b6a5cac2ad6d64bbe60e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Dec 2012 15:01:06 -0800
Subject: [PATCH] --- yaml --- r: 348206 b: refs/heads/master c:
 fcb35a9bac6710851bbca1b7908ca85e83aecb4a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 67cba1d0b582..69835fd54bbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b881bc469bdbdcca60e75047885509eb9886d3a2
+refs/heads/master: fcb35a9bac6710851bbca1b7908ca85e83aecb4a
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 16b42af393ac..196709f5ee58 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -3122,8 +3122,8 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim)
    not required for correctness.  So if the last cpu in a node goes
    away, we get changed to run anywhere: as the first one comes back,
    restore their cpu bindings. */
-static int __devinit cpu_callback(struct notifier_block *nfb,
-				  unsigned long action, void *hcpu)
+static int cpu_callback(struct notifier_block *nfb, unsigned long action,
+			void *hcpu)
 {
 	int nid;