summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Ungerer2011-08-22 09:07:40 +0200
committerGreg Ungerer2011-10-18 06:22:26 +0200
commitc06e9bb427bc8ae74b43a99888da077c20747165 (patch)
treeddaa9778e2d3d4c0526d6850b57ae5c79355dfe8 /arch
parentm68k: merge the mmu and non-mmu traps.c files (diff)
downloadkernel-qcow2-linux-c06e9bb427bc8ae74b43a99888da077c20747165.tar.gz
kernel-qcow2-linux-c06e9bb427bc8ae74b43a99888da077c20747165.tar.xz
kernel-qcow2-linux-c06e9bb427bc8ae74b43a99888da077c20747165.zip
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>
Diffstat (limited to 'arch')
-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 @@
#include <asm-generic/sections.h>
+extern char _sbss[], _ebss[];
+
#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 @@
#include <asm/irq.h>
#include <asm/machdep.h>
#include <asm/pgtable.h>
+#include <asm/sections.h>
unsigned long memory_start;
unsigned long memory_end;
@@ -80,7 +81,6 @@ void (*mach_power_off)(void);
#define CPU_INSTR_PER_JIFFY 16
#endif
-extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
extern int _ramstart, _ramend;
#if defined(CONFIG_UBOOT)