From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 9 Aug 2009 12:33:08 +0000 (+0000)
Subject: revert some accidentally committed test/debug changes from the module symbol export... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ed5f6f4efa65275662bc0b43a983ffaba7b0a634;p=openwrt%2Fstaging%2Faparcar.git

revert some accidentally committed test/debug changes from the module symbol export patch - should fix #5655

SVN-Revision: 17200
---

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 c7cf2fb231..014f47dab6 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 f42fca1d31..725f3dce09 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 */						\