diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-10 11:45:11 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-10 11:45:11 -0800 |
| commit | 717e53d9e99894f6e0f35f63ba229093a8f1106c (patch) | |
| tree | f80a77f7617f25141aeee9f8a9a6e204d314b0dc /driver | |
| parent | 8d13812761dc893d77d0ab3d913eb286b6e22555 (diff) | |
| download | patches-717e53d9e99894f6e0f35f63ba229093a8f1106c.tar.gz | |
fix up the gpl-future stuff for the 2 arches that don't use the generic linker header
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/export_symbol_gpl_future.patch | 54 |
1 files changed, 53 insertions, 1 deletions
diff --git a/driver/export_symbol_gpl_future.patch b/driver/export_symbol_gpl_future.patch index c151ba84b8d29..6a51ae176d4d1 100644 --- a/driver/export_symbol_gpl_future.patch +++ b/driver/export_symbol_gpl_future.patch @@ -8,12 +8,14 @@ printed out to the system log. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- + arch/m68knommu/kernel/vmlinux.lds.S | 10 +++ + arch/v850/kernel/vmlinux.lds.S | 8 +++ include/asm-generic/vmlinux.lds.h | 14 +++++ include/linux/module.h | 8 +++ kernel/module.c | 49 ++++++++++++++++++- scripts/genksyms/keywords.c_shipped | 91 ++++++++++++++++++------------------ scripts/genksyms/keywords.gperf | 1 - 5 files changed, 116 insertions(+), 47 deletions(-) + 7 files changed, 134 insertions(+), 47 deletions(-) --- gregkh-2.6.orig/include/asm-generic/vmlinux.lds.h +++ gregkh-2.6/include/asm-generic/vmlinux.lds.h @@ -352,3 +354,53 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> {"union", UNION_KEYW} }; +--- gregkh-2.6.orig/arch/m68knommu/kernel/vmlinux.lds.S ++++ gregkh-2.6/arch/m68knommu/kernel/vmlinux.lds.S +@@ -269,6 +269,11 @@ SECTIONS { + *(__ksymtab_gpl) + __stop___ksymtab_gpl = .; + ++ /* Kernel symbol table: GPL-future symbols */ ++ __start___ksymtab_gpl_future = .; ++ *(__ksymtab_gpl_future) ++ __stop___ksymtab_gpl_future = .; ++ + /* Kernel symbol table: Normal symbols */ + __start___kcrctab = .; + *(__kcrctab) +@@ -279,6 +284,11 @@ SECTIONS { + *(__kcrctab_gpl) + __stop___kcrctab_gpl = .; + ++ /* Kernel symbol table: GPL-future symbols */ ++ __start___kcrctab_gpl_future = .; ++ *(__kcrctab_gpl_future) ++ __stop___kcrctab_gpl_future = .; ++ + /* Kernel symbol table: strings */ + *(__ksymtab_strings) + +--- gregkh-2.6.orig/arch/v850/kernel/vmlinux.lds.S ++++ gregkh-2.6/arch/v850/kernel/vmlinux.lds.S +@@ -64,6 +64,10 @@ + ___start___ksymtab_gpl = .; \ + *(__ksymtab_gpl) \ + ___stop___ksymtab_gpl = .; \ ++ /* Kernel symbol table: GPL-future symbols */ \ ++ ___start___ksymtab_gpl_future = .; \ ++ *(__ksymtab_gpl_future) \ ++ ___stop___ksymtab_gpl_future = .; \ + /* Kernel symbol table: strings */ \ + *(__ksymtab_strings) \ + /* Kernel symbol table: Normal symbols */ \ +@@ -74,6 +78,10 @@ + ___start___kcrctab_gpl = .; \ + *(__kcrctab_gpl) \ + ___stop___kcrctab_gpl = .; \ ++ /* Kernel symbol table: GPL-future symbols */ \ ++ ___start___kcrctab_gpl_future = .; \ ++ *(__kcrctab_gpl_future) \ ++ ___stop___kcrctab_gpl_future = .; \ + /* Built-in module parameters */ \ + . = ALIGN (4) ; \ + ___start___param = .; \ |