Commit a5505464 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge the mmu and non-mmu versions of module.h 



Simple merge of the mmu and non-mmu versions of module.h

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent e2545b65

arch/m68k/include/asm/module.h

+47 −4
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "module_no.h"

#ifndef _ASM_M68K_MODULE_H

#define _ASM_M68K_MODULE_H



#ifdef CONFIG_MMU



struct mod_arch_specific {

	struct m68k_fixup_info *fixup_start, *fixup_end;

};



#define MODULE_ARCH_INIT {				\

	.fixup_start		= __start_fixup,	\

	.fixup_end		= __stop_fixup,		\

}





enum m68k_fixup_type {

	m68k_fixup_memoffset,

	m68k_fixup_vnode_shift,

};



struct m68k_fixup_info {

	enum m68k_fixup_type type;

	void *addr;

};



#define m68k_fixup(type, addr)			\

	"	.section \".m68k_fixup\",\"aw\"\n"	\

	"	.long " #type "," #addr "\n"	\

	"	.previous\n"



extern struct m68k_fixup_info __start_fixup[], __stop_fixup[];



struct module;

extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,

			 struct m68k_fixup_info *end);



#else

#include "module_mm.h"

#endif
 


struct mod_arch_specific {

};



#endif /* CONFIG_MMU */



#define Elf_Shdr Elf32_Shdr

#define Elf_Sym Elf32_Sym

#define Elf_Ehdr Elf32_Ehdr



#endif /* _ASM_M68K_MODULE_H */

arch/m68k/include/asm/module_mm.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
#ifndef _ASM_M68K_MODULE_H

#define _ASM_M68K_MODULE_H



struct mod_arch_specific {

	struct m68k_fixup_info *fixup_start, *fixup_end;

};



#define MODULE_ARCH_INIT {				\

	.fixup_start		= __start_fixup,	\

	.fixup_end		= __stop_fixup,		\

}



#define Elf_Shdr Elf32_Shdr

#define Elf_Sym Elf32_Sym

#define Elf_Ehdr Elf32_Ehdr





enum m68k_fixup_type {

	m68k_fixup_memoffset,

	m68k_fixup_vnode_shift,

};



struct m68k_fixup_info {

	enum m68k_fixup_type type;

	void *addr;

};



#define m68k_fixup(type, addr)			\

	"	.section \".m68k_fixup\",\"aw\"\n"	\

	"	.long " #type "," #addr "\n"	\

	"	.previous\n"



extern struct m68k_fixup_info __start_fixup[], __stop_fixup[];



struct module;

extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,

			 struct m68k_fixup_info *end);



#endif /* _ASM_M68K_MODULE_H */

arch/m68k/include/asm/module_no.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#ifndef ASM_M68KNOMMU_MODULE_H

#define ASM_M68KNOMMU_MODULE_H



struct mod_arch_specific {

};



#define Elf_Shdr Elf32_Shdr

#define Elf_Sym Elf32_Sym

#define Elf_Ehdr Elf32_Ehdr



#endif /* ASM_M68KNOMMU_MODULE_H */