]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
.28 patch
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 18 Feb 2009 19:41:36 +0000 (11:41 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 18 Feb 2009 19:41:36 +0000 (11:41 -0800)
queue-2.6.28/fix-longstanding-error-storage-size-of-__mod_dmi_device_table-isn-t-known.patch [new file with mode: 0644]
queue-2.6.28/series

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 (file)
index 0000000..22f981f
--- /dev/null
@@ -0,0 +1,36 @@
+From 40413dcb7b273bda681dca38e6ff0bbb3728ef11 Mon Sep 17 00:00:00 2001
+From: Alexey Dobriyan <adobriyan@gmail.com>
+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 <adobriyan@gmail.com>
+
+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 <adobriyan@gmail.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ 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 }
index bc92d99b773d405293e8cb196afb26f5edbd5771..0cd4dd7b93af944a7ebd59369cb6dfb48063bb8c 100644 (file)
@@ -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