diff options
Diffstat (limited to 'arch/alpha/kernel/osf_sys.c')
-rw-r--r-- | arch/alpha/kernel/osf_sys.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 73c7622b5297..8a31fc1bfb15 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
@@ -402,15 +402,15 @@ osf_utsname(char __user *name) | |||
402 | 402 | ||
403 | down_read(&uts_sem); | 403 | down_read(&uts_sem); |
404 | error = -EFAULT; | 404 | error = -EFAULT; |
405 | if (copy_to_user(name + 0, system_utsname.sysname, 32)) | 405 | if (copy_to_user(name + 0, utsname()->sysname, 32)) |
406 | goto out; | 406 | goto out; |
407 | if (copy_to_user(name + 32, system_utsname.nodename, 32)) | 407 | if (copy_to_user(name + 32, utsname()->nodename, 32)) |
408 | goto out; | 408 | goto out; |
409 | if (copy_to_user(name + 64, system_utsname.release, 32)) | 409 | if (copy_to_user(name + 64, utsname()->release, 32)) |
410 | goto out; | 410 | goto out; |
411 | if (copy_to_user(name + 96, system_utsname.version, 32)) | 411 | if (copy_to_user(name + 96, utsname()->version, 32)) |
412 | goto out; | 412 | goto out; |
413 | if (copy_to_user(name + 128, system_utsname.machine, 32)) | 413 | if (copy_to_user(name + 128, utsname()->machine, 32)) |
414 | goto out; | 414 | goto out; |
415 | 415 | ||
416 | error = 0; | 416 | error = 0; |
@@ -449,8 +449,8 @@ osf_getdomainname(char __user *name, int namelen) | |||
449 | 449 | ||
450 | down_read(&uts_sem); | 450 | down_read(&uts_sem); |
451 | for (i = 0; i < len; ++i) { | 451 | for (i = 0; i < len; ++i) { |
452 | __put_user(system_utsname.domainname[i], name + i); | 452 | __put_user(utsname()->domainname[i], name + i); |
453 | if (system_utsname.domainname[i] == '\0') | 453 | if (utsname()->domainname[i] == '\0') |
454 | break; | 454 | break; |
455 | } | 455 | } |
456 | up_read(&uts_sem); | 456 | up_read(&uts_sem); |
@@ -607,12 +607,12 @@ osf_sigstack(struct sigstack __user *uss, struct sigstack __user *uoss) | |||
607 | asmlinkage long | 607 | asmlinkage long |
608 | osf_sysinfo(int command, char __user *buf, long count) | 608 | osf_sysinfo(int command, char __user *buf, long count) |
609 | { | 609 | { |
610 | static char * sysinfo_table[] = { | 610 | char *sysinfo_table[] = { |
611 | system_utsname.sysname, | 611 | utsname()->sysname, |
612 | system_utsname.nodename, | 612 | utsname()->nodename, |
613 | system_utsname.release, | 613 | utsname()->release, |
614 | system_utsname.version, | 614 | utsname()->version, |
615 | system_utsname.machine, | 615 | utsname()->machine, |
616 | "alpha", /* instruction set architecture */ | 616 | "alpha", /* instruction set architecture */ |
617 | "dummy", /* hardware serial number */ | 617 | "dummy", /* hardware serial number */ |
618 | "dummy", /* hardware manufacturer */ | 618 | "dummy", /* hardware manufacturer */ |