revert some accidentally committed test/debug changes from the module symbol export...
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.30 / 028-module_exports.patch
1 --- a/include/asm-generic/vmlinux.lds.h
2 +++ b/include/asm-generic/vmlinux.lds.h
3 @@ -4,6 +4,27 @@
4 #define LOAD_OFFSET 0
5 #endif
6
7 +#ifndef SYMTAB_KEEP_STR
8 +#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
9 +#define SYMTAB_DISCARD_STR
10 +#else
11 +#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
12 +#endif
13 +
14 +#ifndef SYMTAB_KEEP
15 +#define SYMTAB_KEEP *(__ksymtab.*)
16 +#define SYMTAB_DISCARD
17 +#else
18 +#define SYMTAB_DISCARD *(__ksymtab.*)
19 +#endif
20 +
21 +#ifndef SYMTAB_KEEP_GPL
22 +#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
23 +#define SYMTAB_DISCARD_GPL
24 +#else
25 +#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
26 +#endif
27 +
28 #ifndef VMLINUX_SYMBOL
29 #define VMLINUX_SYMBOL(_sym_) _sym_
30 #endif
31 @@ -176,35 +197,35 @@
32 /* Kernel symbol table: Normal symbols */ \
33 __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
34 VMLINUX_SYMBOL(__start___ksymtab) = .; \
35 - *(__ksymtab) \
36 + SYMTAB_KEEP \
37 VMLINUX_SYMBOL(__stop___ksymtab) = .; \
38 } \
39 \
40 /* Kernel symbol table: GPL-only symbols */ \
41 __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) { \
42 VMLINUX_SYMBOL(__start___ksymtab_gpl) = .; \
43 - *(__ksymtab_gpl) \
44 + SYMTAB_KEEP_GPL \
45 VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \
46 } \
47 \
48 /* Kernel symbol table: Normal unused symbols */ \
49 __ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \
50 VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \
51 - *(__ksymtab_unused) \
52 + *(__ksymtab_unused.*) \
53 VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \
54 } \
55 \
56 /* Kernel symbol table: GPL-only unused symbols */ \
57 __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
58 VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \
59 - *(__ksymtab_unused_gpl) \
60 + *(__ksymtab_unused_gpl.*) \
61 VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \
62 } \
63 \
64 /* Kernel symbol table: GPL-future-only symbols */ \
65 __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
66 VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \
67 - *(__ksymtab_gpl_future) \
68 + *(__ksymtab_gpl_future.*) \
69 VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \
70 } \
71 \
72 @@ -245,7 +266,13 @@
73 \
74 /* Kernel symbol table: strings */ \
75 __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
76 - *(__ksymtab_strings) \
77 + SYMTAB_KEEP_STR \
78 + } \
79 + \
80 + /DISCARD/ : { \
81 + SYMTAB_DISCARD \
82 + SYMTAB_DISCARD_GPL \
83 + SYMTAB_DISCARD_STR \
84 } \
85 \
86 /* __*init sections */ \
87 --- a/include/linux/module.h
88 +++ b/include/linux/module.h
89 @@ -187,16 +187,24 @@ void *__symbol_get_gpl(const char *symbo
90 #define __CRC_SYMBOL(sym, sec)
91 #endif
92
93 +#ifdef MODULE
94 +#define __EXPORT_SUFFIX(sym)
95 +#else
96 +#define __EXPORT_SUFFIX(sym) "." #sym
97 +#endif
98 +
99 /* For every exported symbol, place a struct in the __ksymtab section */
100 #define __EXPORT_SYMBOL(sym, sec) \
101 extern typeof(sym) sym; \
102 __CRC_SYMBOL(sym, sec) \
103 static const char __kstrtab_##sym[] \
104 - __attribute__((section("__ksymtab_strings"), aligned(1))) \
105 + __attribute__((section("__ksymtab_strings" \
106 + __EXPORT_SUFFIX(sym)), aligned(1))) \
107 = MODULE_SYMBOL_PREFIX #sym; \
108 static const struct kernel_symbol __ksymtab_##sym \
109 __used \
110 - __attribute__((section("__ksymtab" sec), unused)) \
111 + __attribute__((section("__ksymtab" sec \
112 + __EXPORT_SUFFIX(sym)), unused)) \
113 = { (unsigned long)&sym, __kstrtab_##sym }
114
115 #define EXPORT_SYMBOL(sym) \
116 --- a/Makefile
117 +++ b/Makefile
118 @@ -994,7 +994,7 @@ prepare: prepare0
119 # Leave this as default for preprocessing vmlinux.lds.S, which is now
120 # done in arch/$(ARCH)/kernel/Makefile
121
122 -export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
123 +export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH) $(EXTRA_LDSFLAGS)
124
125 # The asm symlink changes when $(ARCH) changes.
126 # Detect this and ask user to run make mrproper
127 --- a/arch/arm/kernel/vmlinux.lds.S
128 +++ b/arch/arm/kernel/vmlinux.lds.S
129 @@ -78,18 +78,6 @@ SECTIONS
130 #endif
131 }
132
133 - /DISCARD/ : { /* Exit code and data */
134 - EXIT_TEXT
135 - EXIT_DATA
136 - *(.exitcall.exit)
137 - *(.ARM.exidx.exit.text)
138 - *(.ARM.extab.exit.text)
139 -#ifndef CONFIG_MMU
140 - *(.fixup)
141 - *(__ex_table)
142 -#endif
143 - }
144 -
145 .text : { /* Real text segment */
146 _text = .; /* Text and read-only data */
147 __exception_text_start = .;
148 @@ -194,6 +182,20 @@ SECTIONS
149 *(COMMON)
150 _end = .;
151 }
152 +
153 + /DISCARD/ : { /* Exit code and data */
154 + EXIT_TEXT
155 + EXIT_DATA
156 + *(.discard)
157 + *(.exitcall.exit)
158 + *(.ARM.exidx.exit.text)
159 + *(.ARM.extab.exit.text)
160 +#ifndef CONFIG_MMU
161 + *(.fixup)
162 + *(__ex_table)
163 +#endif
164 + }
165 +
166 /* Stabs debugging sections. */
167 .stab 0 : { *(.stab) }
168 .stabstr 0 : { *(.stabstr) }
169 --- a/arch/powerpc/kernel/vmlinux.lds.S
170 +++ b/arch/powerpc/kernel/vmlinux.lds.S
171 @@ -37,12 +37,6 @@ jiffies = jiffies_64 + 4;
172 #endif
173 SECTIONS
174 {
175 - /* Sections to be discarded. */
176 - /DISCARD/ : {
177 - *(.exitcall.exit)
178 - EXIT_DATA
179 - }
180 -
181 . = KERNELBASE;
182
183 /*
184 @@ -295,6 +289,12 @@ SECTIONS
185 __bss_stop = .;
186 }
187
188 + /* Sections to be discarded. */
189 + /DISCARD/ : {
190 + *(.exitcall.exit)
191 + EXIT_DATA
192 + }
193 +
194 . = ALIGN(PAGE_SIZE);
195 _end = . ;
196 PROVIDE32 (end = .);