From: Greg Kroah-Hartman Date: Wed, 18 Feb 2009 19:41:36 +0000 (-0800) Subject: .28 patch X-Git-Tag: v2.6.27.19~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef274f9869db35167a264569fd773da36e18c291;p=thirdparty%2Fkernel%2Fstable-queue.git .28 patch --- diff --git a/queue-2.6.28/fix-longstanding-error-storage-size-of-__mod_dmi_device_table-isn-t-known.patch b/queue-2.6.28/fix-longstanding-error-storage-size-of-__mod_dmi_device_table-isn-t-known.patch new file mode 100644 index 00000000000..22f981f323e --- /dev/null +++ b/queue-2.6.28/fix-longstanding-error-storage-size-of-__mod_dmi_device_table-isn-t-known.patch @@ -0,0 +1,36 @@ +From 40413dcb7b273bda681dca38e6ff0bbb3728ef11 Mon Sep 17 00:00:00 2001 +From: Alexey Dobriyan +Date: Thu, 22 Jan 2009 01:58:36 +0300 +Subject: Fix longstanding "error: storage size of '__mod_dmi_device_table' isn't known" + +From: Alexey Dobriyan + +commit 40413dcb7b273bda681dca38e6ff0bbb3728ef11 upstream. + +gcc 3.4.6 doesn't like MODULE_DEVICE_TABLE(dmi, x) expansion enough to +error out. Shut it up in a most simple way. + +Signed-off-by: Alexey Dobriyan +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/mod_devicetable.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/include/linux/mod_devicetable.h ++++ b/include/linux/mod_devicetable.h +@@ -443,6 +443,13 @@ struct dmi_system_id { + struct dmi_strmatch matches[4]; + void *driver_data; + }; ++/* ++ * struct dmi_device_id appears during expansion of ++ * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it ++ * but this is enough for gcc 3.4.6 to error out: ++ * error: storage size of '__mod_dmi_device_table' isn't known ++ */ ++#define dmi_device_id dmi_system_id + #endif + + #define DMI_MATCH(a, b) { a, b } diff --git a/queue-2.6.28/series b/queue-2.6.28/series index bc92d99b773..0cd4dd7b93a 100644 --- a/queue-2.6.28/series +++ b/queue-2.6.28/series @@ -36,3 +36,4 @@ ext4-only-use-i_size_high-for-regular-files.patch ext4-add-sanity-check-to-make_indexed_dir.patch jbd2-on-a-__journal_expect-assertion-failure-printk-jbd2-not-ext3-fs.patch ext4-initialize-the-new-group-descriptor-when-resizing-the-filesystem.patch +fix-longstanding-error-storage-size-of-__mod_dmi_device_table-isn-t-known.patch