1 files changed, 5 insertions, 2 deletions

diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 2c05a9292a81..cbc37216bf90 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -48,6 +48,7 @@
 #include <linux/unistd.h>
 #include <linux/kallsyms.h>
 #include <linux/uaccess.h>
+#include <linux/rcupdate.h>
 
 #include <asm/io.h>
 #include <asm/asm-offsets.h>
@@ -69,8 +70,10 @@ void cpu_idle(void)
 
         /* endless idle loop with no priority at all */
         while (1) {
+                rcu_idle_enter();
                 while (!need_resched())
                         barrier();
+                rcu_idle_exit();
                 schedule_preempt_disabled();
                 check_pgt_cache();
         }
@@ -339,13 +342,13 @@ unsigned long thread_saved_pc(struct task_struct *t)
 asmlinkage int sys_execve(struct pt_regs *regs)
 {
         int error;
-        char *filename;
+        struct filename *filename;
 
         filename = getname((const char __user *) regs->gr[26]);
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                           (const char __user *const __user *) regs->gr[25],
                           (const char __user *const __user *) regs->gr[24],
                           regs);