On Tue, Jan 08, 2008 at 10:56:09AM +0100, Jean Delvare wrote:Hi Jean, Thank you, I have tested the patch, it fixes the build failure. Tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> --- drivers/firmware/dmi-id.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) --- linux-2.6.24-rc7.orig/drivers/firmware/dmi-id.c 2007-10-24 09:59:28.000000000 +0200 +++ linux-2.6.24-rc7/drivers/firmware/dmi-id.c 2008-01-08 10:32:00.000000000 +0100 @@ -175,12 +175,11 @@ static struct device *dmi_dev; extern int dmi_available; -static int __init dmi_id_init(void) +/* In a separate function to keep gcc 3.2 happy - do NOT merge this in + dmi_id_init! */ +static void __init dmi_id_init_attr_table(void) { - int ret, i; - - if (!dmi_available) - return -ENODEV; + int i; /* Not necessarily all DMI fields are available on all * systems, hence let's built an attribute table of just @@ -205,6 +204,16 @@ static int __init dmi_id_init(void) ADD_DMI_ATTR(chassis_serial, DMI_CHASSIS_SERIAL); ADD_DMI_ATTR(chassis_asset_tag, DMI_CHASSIS_ASSET_TAG); sys_dmi_attributes[i++] = &sys_dmi_modalias_attr.attr; +} + +static int __init dmi_id_init(void) +{ + int ret; + + if (!dmi_available) + return -ENODEV; + + dmi_id_init_attr_table(); ret = class_register(&dmi_class); if (ret) I'll now check if I can do something similar for snd-mixer-oss. -- Jean Delvare --
| Kamalesh Babulal | Re: 2.6.23-rc6-mm1 |
| Bart Van Assche | Integration of SCST in the mainstream Linux kernel |
| Gabriel C | Re: 2.6.22-rc6-mm1 |
| Linus Torvalds | Linux 2.6.27 |
git: | |
| Linus Torvalds | [PATCH 1/6] diff-lib: use ce_mode_from_stat() rather than messing with modes manua... |
| Joakim Tjernlund | git-svn set-tree bug |
| Francis Moreau | emacs and git... |
| Bill Lear | Meaning of "fatal: protocol error: bad line length character"? |
| Marcos Laufer | dmesg IBM x3650 OpenBSD 4.3 |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| ropers | Re: About Xen: maybe a reiterative question but .. |
| Richard Stallman | Real men don't attack straw men |
| Hans Reiser | Re: silent semantic changes with reiser4 |
| Phillip Lougher | [ANN] Squashfs 3.3 released |
| Jeff Garzik | Re: [Ext2-devel] [RFC 0/13] extents and 48bit ext3 |
| Valerie Henson | Re: [RFD] Incremental fsck |
| How to make my PCIE ATA storage device running in Linux | 5 hours ago | Linux general |
| sata/ide timeout errors on asus server-mb | 9 hours ago | Linux kernel |
| Shared swap partition | 9 hours ago | Linux general |
| usb mic not detected | 14 hours ago | Applications and Utilities |
| Problem in Inserting a module | 14 hours ago | Linux kernel |
| Treason Uncloaked | 20 hours ago | Linux kernel |
| high memory | 3 days ago | Linux kernel |
| semaphore access speed | 3 days ago | Applications and Utilities |
| the kernel how to power off the machine | 3 days ago | Linux kernel |
| Easter Eggs in windows XP | 3 days ago | Windows |
