Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c06e9bb4 authored Aug 22, 2011 by Greg Ungerer

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>

parent 144077ea

arch/m68k/include/asm/sections.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,4 +3,6 @@

	#include <asm-generic/sections.h>		#include <asm-generic/sections.h>

			extern char _sbss[], _ebss[];

	#endif /* _ASM_M68K_SECTIONS_H */		#endif /* _ASM_M68K_SECTIONS_H */

arch/m68k/kernel/setup_no.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/machdep.h>		#include <asm/machdep.h>
	#include <asm/pgtable.h>		#include <asm/pgtable.h>
			#include <asm/sections.h>

	unsigned long memory_start;		unsigned long memory_start;
	unsigned long memory_end;		unsigned long memory_end;
	@@ -80,7 +81,6 @@ void (*mach_power_off)(void);
	#define CPU_INSTR_PER_JIFFY 16		#define CPU_INSTR_PER_JIFFY 16
	#endif		#endif

	extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
	extern int _ramstart, _ramend;		extern int _ramstart, _ramend;

	#if defined(CONFIG_UBOOT)		#if defined(CONFIG_UBOOT)