Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b644bd authored by Serge E. Hallyn's avatar Serge E. Hallyn Committed by Linus Torvalds
Browse files

[PATCH] namespaces: utsname: use init_utsname when appropriate 



In some places, particularly drivers and __init code, the init utsns is the
appropriate one to use.  This patch replaces those with a the init_utsname
helper.

Changes: Removed several uses of init_utsname().  Hope I picked all the
	right ones in net/ipv4/ipconfig.c.  These are now changed to
	utsname() (the per-process namespace utsname) in the previous
	patch (2/7)

[akpm@osdl.org: CIFS fix]
Signed-off-by: default avatarSerge E. Hallyn <serue@us.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Andrey Savochkin <saw@sw.ru>
Cc: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e9ff3990

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void __init setup_processor(void) 
	       cpu_name, processor_id, (int)processor_id & 15,

	       proc_arch[cpu_architecture()], cr_alignment);



	sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);

	sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS);

	sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);

	elf_hwcap = list->elf_hwcap;

#ifndef CONFIG_ARM_THUMB

arch/arm26/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void __init setup_processor(void) 


	dump_cpu_info();



	sprintf(system_utsname.machine, "%s", list->arch_name);

	sprintf(init_utsname()->machine, "%s", list->arch_name);

	sprintf(elf_platform, "%s", list->elf_name);

	elf_hwcap = list->elf_hwcap;

arch/cris/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ setup_arch(char **cmdline_p) 
	show_etrax_copyright();



	/* Setup utsname */

	strcpy(system_utsname.machine, cris_machine_name);

	strcpy(init_utsname()->machine, cris_machine_name);

}



static void *c_start(struct seq_file *m, loff_t *pos)

arch/i386/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -297,9 +297,9 @@ void show_regs(struct pt_regs * regs) 
	if (user_mode_vm(regs))

		printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);

	printk(" EFLAGS: %08lx    %s  (%s %.*s)\n",

	       regs->eflags, print_tainted(), system_utsname.release,

	       (int)strcspn(system_utsname.version, " "),

	       system_utsname.version);

	       regs->eflags, print_tainted(), init_utsname()->release,

	       (int)strcspn(init_utsname()->version, " "),

	       init_utsname()->version);

	printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",

		regs->eax,regs->ebx,regs->ecx,regs->edx);

	printk("ESI: %08lx EDI: %08lx EBP: %08lx",

arch/i386/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -357,9 +357,9 @@ void show_registers(struct pt_regs *regs) 
		KERN_EMERG "EIP:    %04x:[<%08lx>]    %s VLI\n"

		KERN_EMERG "EFLAGS: %08lx   (%s %.*s)\n",

		smp_processor_id(), 0xffff & regs->xcs, regs->eip,

		print_tainted(), regs->eflags, system_utsname.release,

		(int)strcspn(system_utsname.version, " "),

		system_utsname.version);

		print_tainted(), regs->eflags, init_utsname()->release,

		(int)strcspn(init_utsname()->version, " "),

		init_utsname()->version);

	print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip);

	printk(KERN_EMERG "eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",

		regs->eax, regs->ebx, regs->ecx, regs->edx);