diff --git a/[refs] b/[refs]
index 2d0a361e6673..afacf92e8ba1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 538bacf8a4802d209f955726b66891b8a921dabf
+refs/heads/master: 78d9955bb06493e7bd78e43dfdc17fb5f1dc59b6
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 3b21a13d841c..fe14a8c87fc2 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1896,7 +1896,7 @@ static int __devinit pageset_cpuup_callback(struct notifier_block *nfb,
 static struct notifier_block pageset_notifier =
 	{ &pageset_cpuup_callback, NULL, 0 };
 
-void __init setup_per_cpu_pageset()
+void __init setup_per_cpu_pageset(void)
 {
 	int err;