1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index 98489d82801b..a0c1a29a507f 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -880,7 +880,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user
         return 0;
 }
 
-static void deferred_cad(void *dummy)
+static void deferred_cad(struct work_struct *dummy)
 {
         kernel_restart(NULL);
 }
@@ -892,7 +892,7 @@ static void deferred_cad(void *dummy)
  */
 void ctrl_alt_del(void)
 {
-        static DECLARE_WORK(cad_work, deferred_cad, NULL);
+        static DECLARE_WORK(cad_work, deferred_cad);
 
         if (C_A_D)
                 schedule_work(&cad_work);
@@ -1102,14 +1102,14 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid)
 asmlinkage long sys_setuid(uid_t uid)
 {
         int old_euid = current->euid;
-        int old_ruid, old_suid, new_ruid, new_suid;
+        int old_ruid, old_suid, new_suid;
         int retval;
 
         retval = security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_ID);
         if (retval)
                 return retval;
 
-        old_ruid = new_ruid = current->uid;
+        old_ruid = current->uid;
         old_suid = current->suid;
         new_suid = old_suid;