From 98c87b0830d5e79b98f16fc0beb9e9d0958bbad6 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 11 Feb 2010 13:31:40 +0000
Subject: [PATCH] kernel: 2.6.32: move discarding of SYMTAB entries to the
 right place.

This helps to avoid linker errors on various targets. Also remove the
scsi_sd section fix patch, because it is not needed now.


SVN-Revision: 19583
---
 .../patches-2.6.32/028-module_exports.patch    | 18 +++++++++++-------
 .../270-scci_sd_section_fix.patch              | 11 -----------
 2 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch

diff --git a/target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch
index b06939f48c..5d86333c73 100644
--- a/target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch
@@ -69,21 +69,25 @@
  		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
  	}								\
  									\
-@@ -323,7 +344,13 @@
+@@ -323,7 +344,7 @@
  									\
  	/* Kernel symbol table: strings */				\
          __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
 -		*(__ksymtab_strings)					\
 +		SYMTAB_KEEP_STR						\
-+	}								\
-+									\
-+	/DISCARD/ : {							\
-+		SYMTAB_DISCARD						\
-+		SYMTAB_DISCARD_GPL					\
-+		SYMTAB_DISCARD_STR					\
  	}								\
  									\
  	/* __*init sections */						\
+@@ -638,6 +659,9 @@
+ 	EXIT_TEXT							\
+ 	EXIT_DATA							\
+ 	EXIT_CALL							\
++	SYMTAB_DISCARD							\
++	SYMTAB_DISCARD_GPL						\
++	SYMTAB_DISCARD_STR						\
+ 	*(.discard)							\
+ 	}
+ 
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
 @@ -192,16 +192,24 @@ void *__symbol_get_gpl(const char *symbo
diff --git a/target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch b/target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch
deleted file mode 100644
index 3389b4b8c6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/scsi/sd.c
-+++ b/drivers/scsi/sd.c
-@@ -2394,7 +2394,7 @@ err_out:
-  *
-  *	Note: this function unregisters this driver from the scsi mid-level.
-  **/
--static void __exit exit_sd(void)
-+static void exit_sd(void)
- {
- 	int i;
- 
-- 
2.30.2