diff options
Diffstat (limited to 'arch/m32r')
-rw-r--r-- | arch/m32r/include/uapi/asm/Kbuild | 3 | ||||
-rw-r--r-- | arch/m32r/kernel/process.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild new file mode 100644 index 000000000000..baebb3da1d44 --- /dev/null +++ b/arch/m32r/include/uapi/asm/Kbuild | |||
@@ -0,0 +1,3 @@ | |||
1 | # UAPI Header export list | ||
2 | include include/uapi/asm-generic/Kbuild.asm | ||
3 | |||
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 3a4a32b27208..384e63f3a4c4 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/ptrace.h> | 26 | #include <linux/ptrace.h> |
27 | #include <linux/unistd.h> | 27 | #include <linux/unistd.h> |
28 | #include <linux/hardirq.h> | 28 | #include <linux/hardirq.h> |
29 | #include <linux/rcupdate.h> | ||
29 | 30 | ||
30 | #include <asm/io.h> | 31 | #include <asm/io.h> |
31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
@@ -82,6 +83,7 @@ void cpu_idle (void) | |||
82 | { | 83 | { |
83 | /* endless idle loop with no priority at all */ | 84 | /* endless idle loop with no priority at all */ |
84 | while (1) { | 85 | while (1) { |
86 | rcu_idle_enter(); | ||
85 | while (!need_resched()) { | 87 | while (!need_resched()) { |
86 | void (*idle)(void) = pm_idle; | 88 | void (*idle)(void) = pm_idle; |
87 | 89 | ||
@@ -90,6 +92,7 @@ void cpu_idle (void) | |||
90 | 92 | ||
91 | idle(); | 93 | idle(); |
92 | } | 94 | } |
95 | rcu_idle_exit(); | ||
93 | schedule_preempt_disabled(); | 96 | schedule_preempt_disabled(); |
94 | } | 97 | } |
95 | } | 98 | } |