[Linuxconsole-commit]CVS: ruby/linux/arch/arm/kernel setup.c,1.15,1.16

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/arm/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv15026/linux/arch/arm/kernel

Modified Files:
	setup.c 
Log Message:
Synced to 2.5.59

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/arm/kernel/setup.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- setup.c	23 Nov 2002 00:55:44 -0000	1.15
+++ setup.c	1 Feb 2003 18:57:11 -0000	1.16
@@ -80,7 +80,7 @@
 unsigned long phys_initrd_size __initdata = 0;
 
 static struct meminfo meminfo __initdata = { 0, };
-static struct proc_info_item proc_info;
+static const char *cpu_name;
 static const char *machine_name;
 static char command_line[COMMAND_LINE_SIZE];
 
@@ -274,7 +274,7 @@
 		while (1);
 	}
 
-	proc_info = *list->info;
+	cpu_name = list->cpu_name;
 
 #ifdef MULTI_CPU
 	processor = *list->proc;
@@ -286,9 +286,9 @@
 	cpu_user = *list->user;
 #endif
 
-	printk("CPU: %s %s revision %d (ARMv%s)\n",
-	       proc_info.manufacturer, proc_info.cpu_name,
-	       (int)processor_id & 15, proc_arch[cpu_architecture()]);
+	printk("CPU: %s [%08x] revision %d (ARMv%s)\n",
+	       cpu_name, processor_id, (int)processor_id & 15,
+	       proc_arch[cpu_architecture()]);
 
 	dump_cpu_info();
 
@@ -714,9 +714,8 @@
 {
 	int i;
 
-	seq_printf(m, "Processor\t: %s %s rev %d (%s)\n",
-		   proc_info.manufacturer, proc_info.cpu_name,
-		   (int)processor_id & 15, elf_platform);
+	seq_printf(m, "Processor\t: %s rev %d (%s)\n",
+		   cpu_name, (int)processor_id & 15, elf_platform);
 
 	seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
 		   loops_per_jiffy / (500000/HZ),