Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[mv-sheeva.git] / kernel / stop_machine.c

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index d3f960a6ca565ad065b97eb1f9cc725d142b096f..2f194e965715183786f2f8b640ddcbbf1b456dc4 100644 (file)
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -12,7 +12,7 @@
 #include <linux/cpu.h>
 #include <linux/init.h>
 #include <linux/kthread.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/percpu.h>
 #include <linux/sched.h>
 #include <linux/stop_machine.h>
@@ -494,7 +494,7 @@ int __stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus)
                 * early in boot before stop_machine() has been
                 * initialized.
                 */
-               unsigned long flags;
+               unsigned long flags;
                int ret;
 
                WARN_ON_ONCE(smdata.num_threads != 1);