Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 15 insertions, 13 deletions

diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index 27f1fce64ce4..fe21adf3e75e 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -53,22 +53,18 @@ asmlinkage void ret_from_fork(void);
 #if !defined(CONFIG_H8300H_SIM) && !defined(CONFIG_H8S_SIM)
 void default_idle(void)
 {
-        while(1) {
-                if (!need_resched()) {
-                        local_irq_enable();
-                        __asm__("sleep");
-                        local_irq_disable();
-                }
-                schedule();
-        }
+        local_irq_disable();
+        if (!need_resched()) {
+                local_irq_enable();
+                /* XXX: race here! What if need_resched() gets set now? */
+                __asm__("sleep");
+        } else
+                local_irq_enable();
 }
 #else
 void default_idle(void)
 {
-        while(1) {
-                if (need_resched())
-                        schedule();
-        }
+        cpu_relax();
 }
 #endif
 void (*idle)(void) = default_idle;
@@ -81,7 +77,13 @@ void (*idle)(void) = default_idle;
  */
 void cpu_idle(void)
 {
-        idle();
+        while (1) {
+                while (!need_resched())
+                        idle();
+                preempt_enable_no_resched();
+                schedule();
+                preempt_disable();
+        }
 }
 
 void machine_restart(char * __unused)