Эх сурвалжийг харах

sparc32: Kill boot_cpu_id4

It is written, but never actually read.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 13 жил өмнө
parent
commit
837ebf0ec7

+ 0 - 1
arch/sparc/include/asm/setup.h

@@ -20,7 +20,6 @@ extern char reboot_command[];
  * Only sun4d + leon may have boot_cpu_id != 0
  * Only sun4d + leon may have boot_cpu_id != 0
  */
  */
 extern unsigned char boot_cpu_id;
 extern unsigned char boot_cpu_id;
-extern unsigned char boot_cpu_id4;
 
 
 extern unsigned long empty_bad_page;
 extern unsigned long empty_bad_page;
 extern unsigned long empty_bad_page_table;
 extern unsigned long empty_bad_page_table;

+ 1 - 4
arch/sparc/kernel/head_32.S

@@ -819,10 +819,7 @@ continue_boot:
 		mov	%g0, %g3
 		mov	%g0, %g3
 		stub	%g3, [%g2 + %lo(boot_cpu_id)]
 		stub	%g3, [%g2 + %lo(boot_cpu_id)]
 
 
-1:		/* boot_cpu_id set. calculate boot_cpu_id4 = boot_cpu_id*4 */
-		sll	%g3, 2, %g3
-		sethi	%hi(boot_cpu_id4), %g2
-		stub	%g3, [%g2 + %lo(boot_cpu_id4)]
+1:		sll	%g3, 2, %g3
 
 
 		/* Initialize the uwinmask value for init task just in case.
 		/* Initialize the uwinmask value for init task just in case.
 		 * But first make current_set[boot_cpu_id] point to something useful.
 		 * But first make current_set[boot_cpu_id] point to something useful.

+ 0 - 1
arch/sparc/kernel/setup_32.c

@@ -105,7 +105,6 @@ unsigned long cmdline_memory_size __initdata = 0;
 
 
 /* which CPU booted us (0xff = not set) */
 /* which CPU booted us (0xff = not set) */
 unsigned char boot_cpu_id = 0xff; /* 0xff will make it into DATA section... */
 unsigned char boot_cpu_id = 0xff; /* 0xff will make it into DATA section... */
-unsigned char boot_cpu_id4; /* boot_cpu_id << 2 */
 
 
 static void
 static void
 prom_console_write(struct console *con, const char *s, unsigned n)
 prom_console_write(struct console *con, const char *s, unsigned n)