aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-02-16 16:34:45 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-02-16 16:34:45 -0800
commit5514cc674d84dfade8b094203b48abded42e3f58 (patch)
tree5a685d420b1aac5ae84b188f132a132cb008d785 /driver
parent368dfc1b15187aa9c1fc9eae54be6a1c2f290651 (diff)
downloadpatches-5514cc674d84dfade8b094203b48abded42e3f58.tar.gz
forgot to handle MODULE=N in config
Diffstat (limited to 'driver')
-rw-r--r--driver/export_symbol_gpl_future.patch12
1 files changed, 10 insertions, 2 deletions
diff --git a/driver/export_symbol_gpl_future.patch b/driver/export_symbol_gpl_future.patch
index 6a51ae176d4d1..4587a5dcc410a 100644
--- a/driver/export_symbol_gpl_future.patch
+++ b/driver/export_symbol_gpl_future.patch
@@ -11,11 +11,11 @@ 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 +++
+ include/linux/module.h | 9 +++
kernel/module.c | 49 ++++++++++++++++++-
scripts/genksyms/keywords.c_shipped | 91 ++++++++++++++++++------------------
scripts/genksyms/keywords.gperf | 1
- 7 files changed, 134 insertions(+), 47 deletions(-)
+ 7 files changed, 135 insertions(+), 47 deletions(-)
--- gregkh-2.6.orig/include/asm-generic/vmlinux.lds.h
+++ gregkh-2.6/include/asm-generic/vmlinux.lds.h
@@ -71,6 +71,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* Exception table */
unsigned int num_exentries;
const struct exception_table_entry *extable;
+@@ -441,6 +449,7 @@ void module_remove_driver(struct device_
+ #else /* !CONFIG_MODULES... */
+ #define EXPORT_SYMBOL(sym)
+ #define EXPORT_SYMBOL_GPL(sym)
++#define EXPORT_SYMBOL_GPL_FUTURE(sym)
+
+ /* Given an address, look for it in the exception tables. */
+ static inline const struct exception_table_entry *
--- gregkh-2.6.orig/kernel/module.c
+++ gregkh-2.6/kernel/module.c
@@ -126,8 +126,11 @@ extern const struct kernel_symbol __star