Skip to content

Commit

Permalink
sparc: use _start for the start entry (like 64 bit does)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Jan 5, 2011
1 parent e405ae7 commit b2a39b0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
6 changes: 3 additions & 3 deletions arch/sparc/boot/piggyback_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ static void usage(void)

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;
else if (strcmp(line + 16, " T start\n") == 0)
else if (strcmp(line + 16, " T _start\n") == 0)
return 1;
return 0;
}
Expand All @@ -92,7 +92,7 @@ static int end_line(const char *line)
/*
* Find address for start and end in System.map.
* The file looks like this:
* f0004000 T start
* f0004000 T _start
* f0379f79 A _end
* 1234567890123456
* ^coloumn 1
Expand Down
3 changes: 1 addition & 2 deletions arch/sparc/kernel/head_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,11 @@ sun4e_notsup:

/* The Sparc trap table, bootloader gives us control at _start. */
__HEAD
.globl start, _stext, _start, __stext
.globl _stext, _start, __stext
.globl trapbase
_start: /* danger danger */
__stext:
_stext:
start:
trapbase:
#ifdef CONFIG_SMP
trapbase_cpu0:
Expand Down
8 changes: 3 additions & 5 deletions arch/sparc/mm/sun4c.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,14 @@ void __init sun4c_probe_memerr_reg(void)

static inline void sun4c_init_ss2_cache_bug(void)
{
extern unsigned long start;

if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS2)) ||
(idprom->id_machtype == (SM_SUN4C | SM_4C_IPX)) ||
(idprom->id_machtype == (SM_SUN4C | SM_4C_ELC))) {
/* Whee.. */
printk("SS2 cache bug detected, uncaching trap table page\n");
sun4c_flush_page((unsigned int) &start);
sun4c_put_pte(((unsigned long) &start),
(sun4c_get_pte((unsigned long) &start) | _SUN4C_PAGE_NOCACHE));
sun4c_flush_page((unsigned int) &_start);
sun4c_put_pte(((unsigned long) &_start),
(sun4c_get_pte((unsigned long) &_start) | _SUN4C_PAGE_NOCACHE));
}
}

Expand Down

0 comments on commit b2a39b0

Please sign in to comment.