lkml.org 
[lkml]   [2004]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] 2.6.7-rc1-mm1: fix set_8042_nomux warning
On Thu, May 27, 2004 at 10:57:46PM -0400, Rik van Riel wrote:
> On Thu, 27 May 2004, John Cherry wrote:
>
> > CC arch/i386/kernel/dmi_scan.o
> > arch/i386/kernel/dmi_scan.c:410: warning: `set_8042_nomux' defined but
> > not used
>
> It's called from the dmi routines, with the function
> defined in the DMI table. No idea why this would
> give a warning while the other similar functions
> (eg broken_ps2_resume) don't ...

He's using a .config with CONFIG_ACPI_BOOT=n.

A fix is below.

cu
Adrian

--- linux-2.6.7-rc1-mm1-full/arch/i386/kernel/dmi_scan.c.old 2004-05-28 13:09:22.000000000 +0200
+++ linux-2.6.7-rc1-mm1-full/arch/i386/kernel/dmi_scan.c 2004-05-28 13:10:51.000000000 +0200
@@ -401,23 +401,6 @@
}

/*
- * HP Proliant 8500 systems can't use i8042 in mux mode,
- * or they instantly reboot.
- */
-#ifdef CONFIG_SERIO_I8042
-extern unsigned int i8042_nomux;
-static __init int set_8042_nomux(struct dmi_blacklist *d)
-{
- if (i8042_nomux == 0)
- {
- i8042_nomux = 1;
- printk(KERN_INFO "Disabling i8042 mux mode\n");
- }
- return 0;
-}
-#endif
-
-/*
* This bios swaps the APM minute reporting bytes over (Many sony laptops
* have this problem).
*/
@@ -516,6 +499,24 @@


#ifdef CONFIG_ACPI_BOOT
+
+/*
+ * HP Proliant 8500 systems can't use i8042 in mux mode,
+ * or they instantly reboot.
+ */
+#ifdef CONFIG_SERIO_I8042
+extern unsigned int i8042_nomux;
+static __init int set_8042_nomux(struct dmi_blacklist *d)
+{
+ if (i8042_nomux == 0)
+ {
+ i8042_nomux = 1;
+ printk(KERN_INFO "Disabling i8042 mux mode\n");
+ }
+ return 0;
+}
+#endif
+
extern int acpi_force;

static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist *d)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:03    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean