1 files changed, 17 insertions, 75 deletions
diff --git a/arch/x86/include/asm/generic-module.h b/arch/x86/include/asm/generic-module.h
index 47d62743c4d5..ed5b44de4c91 100644
--- a/arch/x86/include/asm/generic-module.h
+++ b/arch/x86/include/asm/generic-module.h
@@ -1,80 +1,22 @@
-#ifndef _ASM_X86_MODULE_H
+#ifndef __ASM_GENERIC_MODULE_H
-#define _ASM_X86_MODULE_H
+#define __ASM_GENERIC_MODULE_H
-/* x86_32/64 are simple */
+/*
-struct mod_arch_specific {};
+ * Many architectures just need a simple module
+ * loader without arch specific data.
+ */
+struct mod_arch_specific
+{
+};
-#ifdef CONFIG_X86_32
+#ifdef CONFIG_64BIT
-# define Elf_Shdr Elf32_Shdr
+#define Elf_Shdr Elf64_Shdr
-# define Elf_Sym Elf32_Sym
+#define Elf_Sym Elf64_Sym
-# define Elf_Ehdr Elf32_Ehdr
+#define Elf_Ehdr Elf64_Ehdr
 #else
-# define Elf_Shdr Elf64_Shdr
+#define Elf_Shdr Elf32_Shdr
-# define Elf_Sym Elf64_Sym
+#define Elf_Sym Elf32_Sym
-# define Elf_Ehdr Elf64_Ehdr
+#define Elf_Ehdr Elf32_Ehdr
 #endif
-#ifdef CONFIG_X86_64
+#endif /* __ASM_GENERIC_MODULE_H */
-/* 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_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_X86_MODULE_H */

diff --git a/arch/x86/include/asm/generic-module.h b/arch/x86/include/asm/generic-module.h index 47d62743c4d5..ed5b44de4c91 100644 --- a/arch/x86/include/asm/generic-module.h +++ b/arch/x86/include/asm/generic-module.h
@@ -1,80 +1,22 @@
1	#ifndef _ASM_X86_MODULE_H	1	#ifndef __ASM_GENERIC_MODULE_H
2	#define _ASM_X86_MODULE_H	2	#define __ASM_GENERIC_MODULE_H
3		3
4	/* x86_32/64 are simple */	4	/*
5	struct mod_arch_specific {};	5	* Many architectures just need a simple module
		6	* loader without arch specific data.
		7	*/
		8	struct mod_arch_specific
		9	{
		10	};
6		11
7	#ifdef CONFIG_X86_32	12	#ifdef CONFIG_64BIT
8	# define Elf_Shdr Elf32_Shdr	13	#define Elf_Shdr Elf64_Shdr
9	# define Elf_Sym Elf32_Sym	14	#define Elf_Sym Elf64_Sym
10	# define Elf_Ehdr Elf32_Ehdr	15	#define Elf_Ehdr Elf64_Ehdr
11	#else	16	#else
12	# define Elf_Shdr Elf64_Shdr	17	#define Elf_Shdr Elf32_Shdr
13	# define Elf_Sym Elf64_Sym	18	#define Elf_Sym Elf32_Sym
14	# define Elf_Ehdr Elf64_Ehdr	19	#define Elf_Ehdr Elf32_Ehdr
15	#endif	20	#endif
16		21
17	#ifdef CONFIG_X86_64	22	#endif /* __ASM_GENERIC_MODULE_H */
18	/* X86_64 does not define MODULE_PROC_FAMILY */
19	#elif defined CONFIG_M386
20	#define MODULE_PROC_FAMILY "386 "
21	#elif defined CONFIG_M486
22	#define MODULE_PROC_FAMILY "486 "
23	#elif defined CONFIG_M586
24	#define MODULE_PROC_FAMILY "586 "
25	#elif defined CONFIG_M586TSC
26	#define MODULE_PROC_FAMILY "586TSC "
27	#elif defined CONFIG_M586MMX
28	#define MODULE_PROC_FAMILY "586MMX "
29	#elif defined CONFIG_MCORE2
30	#define MODULE_PROC_FAMILY "CORE2 "
31	#elif defined CONFIG_M686
32	#define MODULE_PROC_FAMILY "686 "
33	#elif defined CONFIG_MPENTIUMII
34	#define MODULE_PROC_FAMILY "PENTIUMII "
35	#elif defined CONFIG_MPENTIUMIII
36	#define MODULE_PROC_FAMILY "PENTIUMIII "
37	#elif defined CONFIG_MPENTIUMM
38	#define MODULE_PROC_FAMILY "PENTIUMM "
39	#elif defined CONFIG_MPENTIUM4
40	#define MODULE_PROC_FAMILY "PENTIUM4 "
41	#elif defined CONFIG_MK6
42	#define MODULE_PROC_FAMILY "K6 "
43	#elif defined CONFIG_MK7
44	#define MODULE_PROC_FAMILY "K7 "
45	#elif defined CONFIG_MK8
46	#define MODULE_PROC_FAMILY "K8 "
47	#elif defined CONFIG_X86_ELAN
48	#define MODULE_PROC_FAMILY "ELAN "
49	#elif defined CONFIG_MCRUSOE
50	#define MODULE_PROC_FAMILY "CRUSOE "
51	#elif defined CONFIG_MEFFICEON
52	#define MODULE_PROC_FAMILY "EFFICEON "
53	#elif defined CONFIG_MWINCHIPC6
54	#define MODULE_PROC_FAMILY "WINCHIPC6 "
55	#elif defined CONFIG_MWINCHIP3D
56	#define MODULE_PROC_FAMILY "WINCHIP3D "
57	#elif defined CONFIG_MCYRIXIII
58	#define MODULE_PROC_FAMILY "CYRIXIII "
59	#elif defined CONFIG_MVIAC3_2
60	#define MODULE_PROC_FAMILY "VIAC3-2 "
61	#elif defined CONFIG_MVIAC7
62	#define MODULE_PROC_FAMILY "VIAC7 "
63	#elif defined CONFIG_MGEODEGX1
64	#define MODULE_PROC_FAMILY "GEODEGX1 "
65	#elif defined CONFIG_MGEODE_LX
66	#define MODULE_PROC_FAMILY "GEODE "
67	#else
68	#error unknown processor family
69	#endif
70
71	#ifdef CONFIG_X86_32
72	# ifdef CONFIG_4KSTACKS
73	# define MODULE_STACKSIZE "4KSTACKS "
74	# else
75	# define MODULE_STACKSIZE ""
76	# endif
77	# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
78	#endif
79
80	#endif /* _ASM_X86_MODULE_H */