diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/kernel/um_arch.c | 6 | ||||
-rw-r--r-- | arch/um/sys-x86_64/sysrq.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 55005710dcbb..97d88e7902f7 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
@@ -167,7 +167,7 @@ static char *usage_string = | |||
167 | 167 | ||
168 | static int __init uml_version_setup(char *line, int *add) | 168 | static int __init uml_version_setup(char *line, int *add) |
169 | { | 169 | { |
170 | printf("%s\n", system_utsname.release); | 170 | printf("%s\n", init_utsname()->release); |
171 | exit(0); | 171 | exit(0); |
172 | 172 | ||
173 | return 0; | 173 | return 0; |
@@ -278,7 +278,7 @@ static int __init Usage(char *line, int *add) | |||
278 | { | 278 | { |
279 | const char **p; | 279 | const char **p; |
280 | 280 | ||
281 | printf(usage_string, system_utsname.release); | 281 | printf(usage_string, init_utsname()->release); |
282 | p = &__uml_help_start; | 282 | p = &__uml_help_start; |
283 | while (p < &__uml_help_end) { | 283 | while (p < &__uml_help_end) { |
284 | printf("%s", *p); | 284 | printf("%s", *p); |
@@ -403,7 +403,7 @@ int linux_main(int argc, char **argv) | |||
403 | /* Reserve up to 4M after the current brk */ | 403 | /* Reserve up to 4M after the current brk */ |
404 | uml_reserved = ROUND_4M(brk_start) + (1 << 22); | 404 | uml_reserved = ROUND_4M(brk_start) + (1 << 22); |
405 | 405 | ||
406 | setup_machinename(system_utsname.machine); | 406 | setup_machinename(init_utsname()->machine); |
407 | 407 | ||
408 | #ifdef CONFIG_CMDLINE_ON_HOST | 408 | #ifdef CONFIG_CMDLINE_ON_HOST |
409 | argv1_begin = argv[1]; | 409 | argv1_begin = argv[1]; |
diff --git a/arch/um/sys-x86_64/sysrq.c b/arch/um/sys-x86_64/sysrq.c index d0a25af19a5b..ce3e07fcf283 100644 --- a/arch/um/sys-x86_64/sysrq.c +++ b/arch/um/sys-x86_64/sysrq.c | |||
@@ -16,7 +16,7 @@ void __show_regs(struct pt_regs * regs) | |||
16 | printk("\n"); | 16 | printk("\n"); |
17 | print_modules(); | 17 | print_modules(); |
18 | printk("Pid: %d, comm: %.20s %s %s\n", | 18 | printk("Pid: %d, comm: %.20s %s %s\n", |
19 | current->pid, current->comm, print_tainted(), system_utsname.release); | 19 | current->pid, current->comm, print_tainted(), init_utsname()->release); |
20 | printk("RIP: %04lx:[<%016lx>] ", PT_REGS_CS(regs) & 0xffff, | 20 | printk("RIP: %04lx:[<%016lx>] ", PT_REGS_CS(regs) & 0xffff, |
21 | PT_REGS_RIP(regs)); | 21 | PT_REGS_RIP(regs)); |
22 | printk("\nRSP: %016lx EFLAGS: %08lx\n", PT_REGS_RSP(regs), | 22 | printk("\nRSP: %016lx EFLAGS: %08lx\n", PT_REGS_RSP(regs), |