diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /kernel/sys.c | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 3f894775488..b88806c6624 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -612,7 +612,6 @@ void kernel_restart(char *cmd) } else { printk(KERN_EMERG "Restarting system with command '%s'.\n", cmd); } - printk(".\n"); machine_restart(cmd); } EXPORT_SYMBOL_GPL(kernel_restart); @@ -2084,12 +2083,12 @@ asmlinkage long sys_getcpu(unsigned __user *cpup, unsigned __user *nodep, * padding */ unsigned long t0, t1; - get_user(t0, &cache->t0); - get_user(t1, &cache->t1); + get_user(t0, &cache->blob[0]); + get_user(t1, &cache->blob[1]); t0++; t1++; - put_user(t0, &cache->t0); - put_user(t1, &cache->t1); + put_user(t0, &cache->blob[0]); + put_user(t1, &cache->blob[1]); } return err ? -EFAULT : 0; } |