aboutsummaryrefslogtreecommitdiffstats
path: root/gregkh
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-02-08 17:02:07 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-02-08 17:02:07 -0800
commitbedc80c69c9409d72a395239098fa5c8c314004d (patch)
tree08903891df2c756f98ec172d6167413c5e5a7c60 /gregkh
parent2fdb5c74ee3f0b5b737f365fbf17e3c0ff6dea10 (diff)
downloadpatches-bedc80c69c9409d72a395239098fa5c8c314004d.tar.gz
added export_symbol_gpl_future stuff
Diffstat (limited to 'gregkh')
-rw-r--r--gregkh/gregkh-gpl_future-test.patch89
1 files changed, 89 insertions, 0 deletions
diff --git a/gregkh/gregkh-gpl_future-test.patch b/gregkh/gregkh-gpl_future-test.patch
new file mode 100644
index 0000000000000..83e4464ae4cf1
--- /dev/null
+++ b/gregkh/gregkh-gpl_future-test.patch
@@ -0,0 +1,89 @@
+---
+ drivers/usb/Makefile | 1 +
+ drivers/usb/gpl_test1.c | 41 +++++++++++++++++++++++++++++++++++++++++
+ drivers/usb/gpl_test2.c | 29 +++++++++++++++++++++++++++++
+ 3 files changed, 71 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/Makefile
++++ gregkh-2.6/drivers/usb/Makefile
+@@ -80,3 +80,4 @@ obj-$(CONFIG_USB_ATM) += atm/
+ obj-$(CONFIG_USB_SPEEDTOUCH) += atm/
+
+ obj-m += gregkh.o
++obj-m += gpl_test1.o gpl_test2.o
+--- /dev/null
++++ gregkh-2.6/drivers/usb/gpl_test1.c
+@@ -0,0 +1,41 @@
++#include <linux/init.h>
++#include <linux/module.h>
++
++
++void gregkh_test_function(void)
++{
++ printk(KERN_INFO "This is the %s function\n", __FUNCTION__);
++}
++EXPORT_SYMBOL(gregkh_test_function);
++
++void gregkh_gpl_test_function(void)
++{
++ printk(KERN_INFO "This is the %s function\n", __FUNCTION__);
++}
++EXPORT_SYMBOL_GPL(gregkh_gpl_test_function);
++
++void gregkh_gpl_test_future_function(void)
++{
++ printk(KERN_INFO "This is the %s function\n", __FUNCTION__);
++}
++EXPORT_SYMBOL_GPL_FUTURE(gregkh_gpl_test_future_function);
++
++
++static int __init start(void)
++{
++ printk(KERN_INFO "gpl_test1 loaded\n");
++ return 0;
++}
++
++static void __exit end(void)
++{
++ printk(KERN_INFO "gpl_test1 unloaded\n");
++}
++
++module_init(start);
++module_exit(end);
++
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("gpl test 1 module");
++
++
+--- /dev/null
++++ gregkh-2.6/drivers/usb/gpl_test2.c
+@@ -0,0 +1,29 @@
++#include <linux/init.h>
++#include <linux/module.h>
++
++
++extern void gregkh_test_function(void);
++extern void gregkh_gpl_test_function(void);
++extern void gregkh_gpl_test_future_function(void);
++
++static int __init start(void)
++{
++ gregkh_test_function();
++// gregkh_gpl_test_function();
++ gregkh_gpl_test_future_function();
++ printk(KERN_INFO "gpl_test2 loaded\n");
++ return 0;
++}
++
++static void __exit end(void)
++{
++ printk(KERN_INFO "gpl_test2 unloaded\n");
++}
++
++module_init(start);
++module_exit(end);
++
++MODULE_LICENSE("Greg's special sauce license");
++MODULE_DESCRIPTION("gpl test 2 module");
++
++