diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-04-11 01:24:08 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-04-11 01:24:08 -0300 |
commit | b2ab53ed51bfad5bd4aa597cce3bdce5fb2af361 (patch) | |
tree | ff09b698cc84f6c12325c3703b0c30d3906779ec /libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch | |
parent | 846524c4c4a6f1beae07d1a957a6ecc807a3cc1f (diff) | |
download | abslibre-b2ab53ed51bfad5bd4aa597cce3bdce5fb2af361.tar.gz abslibre-b2ab53ed51bfad5bd4aa597cce3bdce5fb2af361.tar.bz2 abslibre-b2ab53ed51bfad5bd4aa597cce3bdce5fb2af361.zip |
linux-libre-3.14-4: updating revision
* move from [libre-testing] to [libre]
* remove syscalls.h revert
* properly fix symbol CRC generation
* fix use of code32_start in the EFI boot stub
* re-add MTD_NAND to the configuration to support ricoh sd card readers (FS#25889 => https://bugs.archlinux.org/task/25889)
Diffstat (limited to 'libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch')
-rw-r--r-- | libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch b/libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch deleted file mode 100644 index fe24e100b..000000000 --- a/libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 06d2e746733a83469944481cb7f4fb1c7134a8ce Mon Sep 17 00:00:00 2001 -From: Rusty Russell <rusty@rustcorp.com.au> -Date: Mon, 3 Feb 2014 11:15:13 +1030 -Subject: [PATCH 3/6] module: remove MODULE_GENERIC_TABLE - -MODULE_DEVICE_TABLE() calles MODULE_GENERIC_TABLE(); make it do the -work directly. This also removes a wart introduced in the last patch, -where the alias is defined to be an unknown struct type "struct -type##__##name##_device_id" instead of "struct type##_device_id" (it's -an extern so GCC doesn't care, but it's wrong). - -The other user of MODULE_GENERIC_TABLE (ISAPNP_CARD_TABLE) is unused, -so delete it. - -Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> ---- - include/linux/isapnp.h | 4 ---- - include/linux/module.h | 19 ++++++++----------- - 2 files changed, 8 insertions(+), 15 deletions(-) - -diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h -index e2d28b0..3c77bf9 100644 ---- a/include/linux/isapnp.h -+++ b/include/linux/isapnp.h -@@ -56,10 +56,6 @@ - #define ISAPNP_DEVICE_ID(_va, _vb, _vc, _function) \ - { .vendor = ISAPNP_VENDOR(_va, _vb, _vc), .function = ISAPNP_FUNCTION(_function) } - --/* export used IDs outside module */ --#define ISAPNP_CARD_TABLE(name) \ -- MODULE_GENERIC_TABLE(isapnp_card, name) -- - struct isapnp_card_id { - unsigned long driver_data; /* data private to the driver */ - unsigned short card_vendor, card_device; -diff --git a/include/linux/module.h b/include/linux/module.h -index ad18f60..5686b37 100644 ---- a/include/linux/module.h -+++ b/include/linux/module.h -@@ -82,15 +82,6 @@ void sort_extable(struct exception_table_entry *start, - void sort_main_extable(void); - void trim_init_extable(struct module *m); - --#ifdef MODULE --#define MODULE_GENERIC_TABLE(gtype, name) \ --extern const struct gtype##_id __mod_##gtype##_table \ -- __attribute__ ((unused, alias(__stringify(name)))) -- --#else /* !MODULE */ --#define MODULE_GENERIC_TABLE(gtype, name) --#endif -- - /* Generic info of form tag = "info" */ - #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info) - -@@ -141,8 +132,14 @@ extern const struct gtype##_id __mod_##gtype##_table \ - /* What your module does. */ - #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) - --#define MODULE_DEVICE_TABLE(type, name) \ -- MODULE_GENERIC_TABLE(type##__##name##_device, name) -+#ifdef MODULE -+/* Creates an alias so file2alias.c can find device table. */ -+#define MODULE_DEVICE_TABLE(type, name) \ -+ extern const struct type##_device_id __mod_##type##__##name##_device_table \ -+ __attribute__ ((unused, alias(__stringify(name)))) -+#else /* !MODULE */ -+#define MODULE_DEVICE_TABLE(type, name) -+#endif - - /* Version of form [<epoch>:]<version>[-<extra-version>]. - * Or for CVS/RCS ID version, everything but the number is stripped. --- -1.9.1 - |