Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[linux-2.6-omap-h63xx.git] / arch / parisc / kernel / process.c

diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 7fdca87ef647369bc12a5c77330f35f15c7f7f53..fee4f1f09adc687b84bcfdd5355a6f1fa3c8a1f4 100644 (file)
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -88,11 +88,15 @@ void default_idle(void)
  */
 void cpu_idle(void)
 {
+       set_thread_flag(TIF_POLLING_NRFLAG);
+
        /* endless idle loop with no priority at all */
        while (1) {
                while (!need_resched())
                        barrier();
+               preempt_enable_no_resched();
                schedule();
+               preempt_disable();
                check_pgt_cache();
        }
 }