aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 3f894775488d..b88806c66244 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -612,7 +612,6 @@ void kernel_restart(char *cmd)
612 } else { 612 } else {
613 printk(KERN_EMERG "Restarting system with command '%s'.\n", cmd); 613 printk(KERN_EMERG "Restarting system with command '%s'.\n", cmd);
614 } 614 }
615 printk(".\n");
616 machine_restart(cmd); 615 machine_restart(cmd);
617} 616}
618EXPORT_SYMBOL_GPL(kernel_restart); 617EXPORT_SYMBOL_GPL(kernel_restart);
@@ -2084,12 +2083,12 @@ asmlinkage long sys_getcpu(unsigned __user *cpup, unsigned __user *nodep,
2084 * padding 2083 * padding
2085 */ 2084 */
2086 unsigned long t0, t1; 2085 unsigned long t0, t1;
2087 get_user(t0, &cache->t0); 2086 get_user(t0, &cache->blob[0]);
2088 get_user(t1, &cache->t1); 2087 get_user(t1, &cache->blob[1]);
2089 t0++; 2088 t0++;
2090 t1++; 2089 t1++;
2091 put_user(t0, &cache->t0); 2090 put_user(t0, &cache->blob[0]);
2092 put_user(t1, &cache->t1); 2091 put_user(t1, &cache->blob[1]);
2093 } 2092 }
2094 return err ? -EFAULT : 0; 2093 return err ? -EFAULT : 0;
2095} 2094}