diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-09 12:33:08 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-09 12:33:08 +0000 |
| commit | f052c38f1240b84265d3b47620d5bc856d4fd29b (patch) | |
| tree | 1c3405f1743c3e56cd83467887cee86bc9f105a5 | |
| parent | 5c119ec94fc50038d3412b1c5a24d5f9b67c0072 (diff) | |
revert some accidentally committed test/debug changes from the module symbol export patch - should fix #5655
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17200 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/027-module_exports.patch | 24 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/027-module_exports.patch b/target/linux/generic-2.6/patches-2.6.28/027-module_exports.patch index c7cf2fb23..014f47dab 100644 --- a/target/linux/generic-2.6/patches-2.6.28/027-module_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.28/027-module_exports.patch @@ -5,24 +5,24 @@ #endif +#ifndef SYMTAB_KEEP_STR -+#define SYMTAB_KEEP_STR *(__ksymtab_strings*) ++#define SYMTAB_KEEP_STR *(__ksymtab_strings.*) +#define SYMTAB_DISCARD_STR +#else -+#define SYMTAB_DISCARD_STR *(__ksymtab_strings*) ++#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*) +#endif + +#ifndef SYMTAB_KEEP -+#define SYMTAB_KEEP *(__ksymtab*) ++#define SYMTAB_KEEP *(__ksymtab.*) +#define SYMTAB_DISCARD +#else -+#define SYMTAB_DISCARD *(__ksymtab*) ++#define SYMTAB_DISCARD *(__ksymtab.*) +#endif + +#ifndef SYMTAB_KEEP_GPL -+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl*) ++#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*) +#define SYMTAB_DISCARD_GPL +#else -+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl*) ++#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*) +#endif + #ifndef VMLINUX_SYMBOL @@ -49,7 +49,7 @@ __ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \ - *(__ksymtab_unused) \ -+ *(__ksymtab_unused*) \ ++ *(__ksymtab_unused.*) \ VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \ } \ \ @@ -57,7 +57,7 @@ __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \ - *(__ksymtab_unused_gpl) \ -+ *(__ksymtab_unused_gpl*) \ ++ *(__ksymtab_unused_gpl.*) \ VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \ } \ \ @@ -65,7 +65,7 @@ __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \ - *(__ksymtab_gpl_future) \ -+ *(__ksymtab_gpl_future*) \ ++ *(__ksymtab_gpl_future.*) \ VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \ } \ \ @@ -78,9 +78,9 @@ + } \ + \ + /DISCARD/ : { \ -+ *(__ksymtab.*) \ -+ *(__ksymtab_gpl.*) \ -+ *(__ksymtab_strings.*) \ ++ SYMTAB_DISCARD \ ++ SYMTAB_DISCARD_GPL \ ++ SYMTAB_DISCARD_STR \ } \ \ /* __*init sections */ \ diff --git a/target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch index f42fca1d3..725f3dce0 100644 --- a/target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch @@ -5,24 +5,24 @@ #endif +#ifndef SYMTAB_KEEP_STR -+#define SYMTAB_KEEP_STR *(__ksymtab_strings*) ++#define SYMTAB_KEEP_STR *(__ksymtab_strings.*) +#define SYMTAB_DISCARD_STR +#else -+#define SYMTAB_DISCARD_STR *(__ksymtab_strings*) ++#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*) +#endif + +#ifndef SYMTAB_KEEP -+#define SYMTAB_KEEP *(__ksymtab*) ++#define SYMTAB_KEEP *(__ksymtab.*) +#define SYMTAB_DISCARD +#else -+#define SYMTAB_DISCARD *(__ksymtab*) ++#define SYMTAB_DISCARD *(__ksymtab.*) +#endif + +#ifndef SYMTAB_KEEP_GPL -+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl*) ++#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*) +#define SYMTAB_DISCARD_GPL +#else -+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl*) ++#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*) +#endif + #ifndef VMLINUX_SYMBOL @@ -49,7 +49,7 @@ __ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \ - *(__ksymtab_unused) \ -+ *(__ksymtab_unused*) \ ++ *(__ksymtab_unused.*) \ VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \ } \ \ @@ -57,7 +57,7 @@ __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \ - *(__ksymtab_unused_gpl) \ -+ *(__ksymtab_unused_gpl*) \ ++ *(__ksymtab_unused_gpl.*) \ VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \ } \ \ @@ -65,7 +65,7 @@ __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \ - *(__ksymtab_gpl_future) \ -+ *(__ksymtab_gpl_future*) \ ++ *(__ksymtab_gpl_future.*) \ VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \ } \ \ @@ -78,9 +78,9 @@ + } \ + \ + /DISCARD/ : { \ -+ *(__ksymtab.*) \ -+ *(__ksymtab_gpl.*) \ -+ *(__ksymtab_strings.*) \ ++ SYMTAB_DISCARD \ ++ SYMTAB_DISCARD_GPL \ ++ SYMTAB_DISCARD_STR \ } \ \ /* __*init sections */ \ |