Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b2a39b0d8ec2ce2bdcff4e01572b4e885220254d

Authored by Sam Ravnborg
Committed by David S. Miller
1 parent e405ae76af
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

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>

Showing 3 changed files with 7 additions and 10 deletions Side-by-side Diff

arch/sparc/boot/piggyback_32.c
Diff comments   View file @ b2a39b0
... ... @@ -73,9 +73,9 @@
73 73  
74 74 static int start_line(const char *line)
75 75 {
76   - if (strcmp(line + 8, " T start\n") == 0)
  76 + if (strcmp(line + 8, " T _start\n") == 0)
77 77 return 1;
78   - else if (strcmp(line + 16, " T start\n") == 0)
  78 + else if (strcmp(line + 16, " T _start\n") == 0)
79 79 return 1;
80 80 return 0;
81 81 }
... ... @@ -92,7 +92,7 @@
92 92 /*
93 93 * Find address for start and end in System.map.
94 94 * The file looks like this:
95   - * f0004000 T start
  95 + * f0004000 T _start
96 96 * f0379f79 A _end
97 97 * 1234567890123456
98 98 * ^coloumn 1
arch/sparc/kernel/head_32.S
Diff comments   View file @ b2a39b0
... ... @@ -73,12 +73,11 @@
73 73  
74 74 /* The Sparc trap table, bootloader gives us control at _start. */
75 75 __HEAD
76   - .globl start, _stext, _start, __stext
  76 + .globl _stext, _start, __stext
77 77 .globl trapbase
78 78 _start: /* danger danger */
79 79 __stext:
80 80 _stext:
81   -start:
82 81 trapbase:
83 82 #ifdef CONFIG_SMP
84 83 trapbase_cpu0:
arch/sparc/mm/sun4c.c
Diff comments   View file @ b2a39b0
... ... @@ -435,16 +435,14 @@
435 435  
436 436 static inline void sun4c_init_ss2_cache_bug(void)
437 437 {
438   - extern unsigned long start;
439   -
440 438 if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS2)) ||
441 439 (idprom->id_machtype == (SM_SUN4C | SM_4C_IPX)) ||
442 440 (idprom->id_machtype == (SM_SUN4C | SM_4C_ELC))) {
443 441 /* Whee.. */
444 442 printk("SS2 cache bug detected, uncaching trap table page\n");
445   - sun4c_flush_page((unsigned int) &start);
446   - sun4c_put_pte(((unsigned long) &start),
447   - (sun4c_get_pte((unsigned long) &start) | _SUN4C_PAGE_NOCACHE));
  443 + sun4c_flush_page((unsigned int) &_start);
  444 + sun4c_put_pte(((unsigned long) &_start),
  445 + (sun4c_get_pte((unsigned long) &_start) | _SUN4C_PAGE_NOCACHE));
448 446 }
449 447 }
450 448