lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc: use _start for the start entry (like 64 bit does)

Browse Source 
We use "_start" in 64 bit - do the same in 32 bit.
It is always good to be consistent.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sam Ravnborg
2011-01-04 11:39:12 +00:00
committed by David S. Miller
parent e405ae76af
commit b2a39b0d8e
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sparc/boot/piggyback_32.c
View File

@@ -73,9 +73,9 @@ static void usage(void)
static int start_line(const char *line) static int start_line(const char *line)
{ {
if (strcmp(line + 8, " T start\n") == 0) if (strcmp(line + 8, " T _start\n") == 0)
return 1; return 1;
else if (strcmp(line + 16, " T start\n") == 0) else if (strcmp(line + 16, " T _start\n") == 0)
return 1; return 1;
return 0; return 0;
} }
@@ -92,7 +92,7 @@ static int end_line(const char *line)
/* /*
* Find address for start and end in System.map. * Find address for start and end in System.map.
* The file looks like this: * The file looks like this:
* f0004000 T start * f0004000 T _start
* f0379f79 A _end * f0379f79 A _end
* 1234567890123456 * 1234567890123456
* ^coloumn 1 * ^coloumn 1

3
arch/sparc/kernel/head_32.S
View File

@@ -73,12 +73,11 @@ sun4e_notsup:
/* The Sparc trap table, bootloader gives us control at _start. */ /* The Sparc trap table, bootloader gives us control at _start. */
__HEAD __HEAD
.globl start, _stext, _start, __stext .globl _stext, _start, __stext
.globl trapbase .globl trapbase
_start: /* danger danger */ _start: /* danger danger */
__stext: __stext:
_stext: _stext:
start:
trapbase: trapbase:
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
trapbase_cpu0: trapbase_cpu0:

8
arch/sparc/mm/sun4c.c
View File

@@ -435,16 +435,14 @@ void __init sun4c_probe_memerr_reg(void)
static inline void sun4c_init_ss2_cache_bug(void) static inline void sun4c_init_ss2_cache_bug(void)
{ {
extern unsigned long start;
if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS2)) || if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS2)) ||
(idprom->id_machtype == (SM_SUN4C | SM_4C_IPX)) || (idprom->id_machtype == (SM_SUN4C | SM_4C_IPX)) ||
(idprom->id_machtype == (SM_SUN4C | SM_4C_ELC))) { (idprom->id_machtype == (SM_SUN4C | SM_4C_ELC))) {
/* Whee.. */ /* Whee.. */
printk("SS2 cache bug detected, uncaching trap table page\n"); printk("SS2 cache bug detected, uncaching trap table page\n");
sun4c_flush_page((unsigned int) &start); sun4c_flush_page((unsigned int) &_start);
sun4c_put_pte(((unsigned long) &start), sun4c_put_pte(((unsigned long) &_start),
(sun4c_get_pte((unsigned long) &start) | _SUN4C_PAGE_NOCACHE)); (sun4c_get_pte((unsigned long) &_start) | _SUN4C_PAGE_NOCACHE));
} }
} }