Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[linux-2.6-microblaze.git] / arch / frv / kernel / process.c

diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 014f855..655d90d 100644 (file)
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -25,6 +25,7 @@
 #include <linux/reboot.h>
 #include <linux/interrupt.h>
 #include <linux/pagemap.h>
+#include <linux/rcupdate.h>
 
 #include <asm/asm-offsets.h>
 #include <asm/uaccess.h>
@@ -70,12 +71,14 @@ void cpu_idle(void)
 {
        /* endless idle loop with no priority at all */
        while (1) {
+               rcu_idle_enter();
                while (!need_resched()) {
                        check_pgt_cache();
 
                        if (!frv_dma_inprogress && idle)
                                idle();
                }
+               rcu_idle_exit();
 
                schedule_preempt_disabled();
        }