Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / um / kernel / reboot.c

diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index 6f1a3a288117985e1b4bc9d73bda578284c26d09..7e4305a1fd3c648d91d397a240dde7e8ac659458 100644 (file)
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -5,7 +5,7 @@
 
 #include "linux/module.h"
 #include "linux/sched.h"
-#include "user_util.h"
+#include "asm/smp.h"
 #include "kern_util.h"
 #include "kern.h"
 #include "os.h"
@@ -21,7 +21,7 @@ static void kill_idlers(int me)
        struct task_struct *p;
        int i;
 
-       for(i = 0; i < sizeof(idle_threads)/sizeof(idle_threads[0]); i++){
+       for(i = 0; i < ARRAY_SIZE(idle_threads); i++){
                p = idle_threads[i];
                if((p != NULL) && (p->thread.mode.tt.extern_pid != me))
                        os_kill_process(p->thread.mode.tt.extern_pid, 0);
@@ -61,14 +61,3 @@ void machine_halt(void)
 {
        machine_power_off();
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */