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

Commit 0ddc9cc8 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: unify module_{32|64}.h 



This adds one case to the MODULE_PROC_FAMILY block testing
for X86_64.  There are no new things defined on X86_64 than
there were before.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e7b5e11e

include/asm-x86/module.h

+79 −2
Original line number Original line Diff line number Diff line 
#ifndef _ASM_MODULE_H

#define _ASM_MODULE_H



/* x86_32/64 are simple */

struct mod_arch_specific {};



#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

# include "module_32.h"

# define Elf_Shdr Elf32_Shdr

# define Elf_Sym Elf32_Sym

# define Elf_Ehdr Elf32_Ehdr

#else

#else

# include "module_64.h"

# define Elf_Shdr Elf64_Shdr

# define Elf_Sym Elf64_Sym

# define Elf_Ehdr Elf64_Ehdr

#endif

#endif



#ifdef CONFIG_X86_64

/* X86_64 does not define MODULE_PROC_FAMILY */

#elif defined CONFIG_M386

#define MODULE_PROC_FAMILY "386 "

#elif defined CONFIG_M486

#define MODULE_PROC_FAMILY "486 "

#elif defined CONFIG_M586

#define MODULE_PROC_FAMILY "586 "

#elif defined CONFIG_M586TSC

#define MODULE_PROC_FAMILY "586TSC "

#elif defined CONFIG_M586MMX

#define MODULE_PROC_FAMILY "586MMX "

#elif defined CONFIG_MCORE2

#define MODULE_PROC_FAMILY "CORE2 "

#elif defined CONFIG_M686

#define MODULE_PROC_FAMILY "686 "

#elif defined CONFIG_MPENTIUMII

#define MODULE_PROC_FAMILY "PENTIUMII "

#elif defined CONFIG_MPENTIUMIII

#define MODULE_PROC_FAMILY "PENTIUMIII "

#elif defined CONFIG_MPENTIUMM

#define MODULE_PROC_FAMILY "PENTIUMM "

#elif defined CONFIG_MPENTIUM4

#define MODULE_PROC_FAMILY "PENTIUM4 "

#elif defined CONFIG_MK6

#define MODULE_PROC_FAMILY "K6 "

#elif defined CONFIG_MK7

#define MODULE_PROC_FAMILY "K7 "

#elif defined CONFIG_MK8

#define MODULE_PROC_FAMILY "K8 "

#elif defined CONFIG_X86_ELAN

#define MODULE_PROC_FAMILY "ELAN "

#elif defined CONFIG_MCRUSOE

#define MODULE_PROC_FAMILY "CRUSOE "

#elif defined CONFIG_MEFFICEON

#define MODULE_PROC_FAMILY "EFFICEON "

#elif defined CONFIG_MWINCHIPC6

#define MODULE_PROC_FAMILY "WINCHIPC6 "

#elif defined CONFIG_MWINCHIP2

#define MODULE_PROC_FAMILY "WINCHIP2 "

#elif defined CONFIG_MWINCHIP3D

#define MODULE_PROC_FAMILY "WINCHIP3D "

#elif defined CONFIG_MCYRIXIII

#define MODULE_PROC_FAMILY "CYRIXIII "

#elif defined CONFIG_MVIAC3_2

#define MODULE_PROC_FAMILY "VIAC3-2 "

#elif defined CONFIG_MVIAC7

#define MODULE_PROC_FAMILY "VIAC7 "

#elif defined CONFIG_MGEODEGX1

#define MODULE_PROC_FAMILY "GEODEGX1 "

#elif defined CONFIG_MGEODE_LX

#define MODULE_PROC_FAMILY "GEODE "

#else

#error unknown processor family

#endif



#ifdef CONFIG_X86_32

# ifdef CONFIG_4KSTACKS

#  define MODULE_STACKSIZE "4KSTACKS "

# else

#  define MODULE_STACKSIZE ""

# endif

# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE

#endif



#endif /* _ASM_MODULE_H */

include/asm-x86/module_32.h

deleted100644 → 0
+0 −75
Original line number Original line Diff line number Diff line 
#ifndef _ASM_I386_MODULE_H

#define _ASM_I386_MODULE_H



/* x86 is simple */

struct mod_arch_specific

{

};



#define Elf_Shdr Elf32_Shdr

#define Elf_Sym Elf32_Sym

#define Elf_Ehdr Elf32_Ehdr



#ifdef CONFIG_M386

#define MODULE_PROC_FAMILY "386 "

#elif defined CONFIG_M486

#define MODULE_PROC_FAMILY "486 "

#elif defined CONFIG_M586

#define MODULE_PROC_FAMILY "586 "

#elif defined CONFIG_M586TSC

#define MODULE_PROC_FAMILY "586TSC "

#elif defined CONFIG_M586MMX

#define MODULE_PROC_FAMILY "586MMX "

#elif defined CONFIG_MCORE2

#define MODULE_PROC_FAMILY "CORE2 "

#elif defined CONFIG_M686

#define MODULE_PROC_FAMILY "686 "

#elif defined CONFIG_MPENTIUMII

#define MODULE_PROC_FAMILY "PENTIUMII "

#elif defined CONFIG_MPENTIUMIII

#define MODULE_PROC_FAMILY "PENTIUMIII "

#elif defined CONFIG_MPENTIUMM

#define MODULE_PROC_FAMILY "PENTIUMM "

#elif defined CONFIG_MPENTIUM4

#define MODULE_PROC_FAMILY "PENTIUM4 "

#elif defined CONFIG_MK6

#define MODULE_PROC_FAMILY "K6 "

#elif defined CONFIG_MK7

#define MODULE_PROC_FAMILY "K7 "

#elif defined CONFIG_MK8

#define MODULE_PROC_FAMILY "K8 "

#elif defined CONFIG_X86_ELAN

#define MODULE_PROC_FAMILY "ELAN "

#elif defined CONFIG_MCRUSOE

#define MODULE_PROC_FAMILY "CRUSOE "

#elif defined CONFIG_MEFFICEON

#define MODULE_PROC_FAMILY "EFFICEON "

#elif defined CONFIG_MWINCHIPC6

#define MODULE_PROC_FAMILY "WINCHIPC6 "

#elif defined CONFIG_MWINCHIP2

#define MODULE_PROC_FAMILY "WINCHIP2 "

#elif defined CONFIG_MWINCHIP3D

#define MODULE_PROC_FAMILY "WINCHIP3D "

#elif defined CONFIG_MCYRIXIII

#define MODULE_PROC_FAMILY "CYRIXIII "

#elif defined CONFIG_MVIAC3_2

#define MODULE_PROC_FAMILY "VIAC3-2 "

#elif defined CONFIG_MVIAC7

#define MODULE_PROC_FAMILY "VIAC7 "

#elif defined CONFIG_MGEODEGX1

#define MODULE_PROC_FAMILY "GEODEGX1 "

#elif defined CONFIG_MGEODE_LX

#define MODULE_PROC_FAMILY "GEODE "

#else

#error unknown processor family

#endif



#ifdef CONFIG_4KSTACKS

#define MODULE_STACKSIZE "4KSTACKS "

#else

#define MODULE_STACKSIZE ""

#endif



#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE



#endif /* _ASM_I386_MODULE_H */

include/asm-x86/module_64.h

deleted100644 → 0
+0 −10
Original line number Original line Diff line number Diff line 
#ifndef _ASM_X8664_MODULE_H

#define _ASM_X8664_MODULE_H



struct mod_arch_specific {}; 



#define Elf_Shdr Elf64_Shdr

#define Elf_Sym Elf64_Sym

#define Elf_Ehdr Elf64_Ehdr



#endif