diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-02-11 13:31:40 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-02-11 13:31:40 +0000 |
| commit | b6005618a5821674232b3104ed60986d9780c615 (patch) | |
| tree | a1957a3c096462a2d77ca449912c859e6985fe66 /target/linux/generic-2.6 | |
| parent | 565874a806cb3f79dd6092f1aba32b19d7de5006 (diff) | |
| download | upstream-b6005618a5821674232b3104ed60986d9780c615.tar.gz upstream-b6005618a5821674232b3104ed60986d9780c615.tar.bz2 upstream-b6005618a5821674232b3104ed60986d9780c615.zip | |
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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19583 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch | 18 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch | 11 |
2 files changed, 11 insertions, 18 deletions
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; - |