aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-08-22 03:07:40 -0400
committerGreg Ungerer <gerg@uclinux.org>2011-10-18 00:22:26 -0400
commitc06e9bb427bc8ae74b43a99888da077c20747165 (patch)
treeddaa9778e2d3d4c0526d6850b57ae5c79355dfe8
parent144077ead4428732d27553d3fa74f06f71c6438d (diff)
m68knommu: use generic section names in setup code
We should be including and using sections.h to get at the extern definitions of the linker sections in the m68knommu startup code. Not defining them locally. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r--arch/m68k/include/asm/sections.h2
-rw-r--r--arch/m68k/kernel/setup_no.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/sections.h b/arch/m68k/include/asm/sections.h
index d64967ecfec6..5277e52715ec 100644
--- a/arch/m68k/include/asm/sections.h
+++ b/arch/m68k/include/asm/sections.h
@@ -3,4 +3,6 @@
3 3
4#include <asm-generic/sections.h> 4#include <asm-generic/sections.h>
5 5
6extern char _sbss[], _ebss[];
7
6#endif /* _ASM_M68K_SECTIONS_H */ 8#endif /* _ASM_M68K_SECTIONS_H */
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 16b2de7f5101..d5a616f6fb78 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -36,6 +36,7 @@
36#include <asm/irq.h> 36#include <asm/irq.h>
37#include <asm/machdep.h> 37#include <asm/machdep.h>
38#include <asm/pgtable.h> 38#include <asm/pgtable.h>
39#include <asm/sections.h>
39 40
40unsigned long memory_start; 41unsigned long memory_start;
41unsigned long memory_end; 42unsigned long memory_end;
@@ -80,7 +81,6 @@ void (*mach_power_off)(void);
80#define CPU_INSTR_PER_JIFFY 16 81#define CPU_INSTR_PER_JIFFY 16
81#endif 82#endif
82 83
83extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
84extern int _ramstart, _ramend; 84extern int _ramstart, _ramend;
85 85
86#if defined(CONFIG_UBOOT) 86#if defined(CONFIG_UBOOT)