[PATCH] PnP Fixes for 2.6.10-rc1

[PATCH] PnP Fixes for 2.6.10-rc1

[Adam Belay]

#   2004/10/24 23:07:32-04:00 ambx1@neo.rr.com
#   [PNPBIOS] disable if ACPI is active
#   
#   As further ACPI pnp functionaility is implemented it is no longer
#   safe to run ACPI and PNPBIOS concurrently.
#   
#   We therefore take the following approach:
#   - attempt to enable ACPI support
#   - if ACPI fails (blacklist etc.) enable pnpbios support
#   - if ACPI support is not compiled in the kernel enable pnpbios support
#   
#   Signed-off-by: Adam Belay <ambx1@neo.rr.com>

diff -Nru a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
--- a/drivers/pnp/pnpbios/core.c	2004-10-25 00:08:19 -04:00
+++ b/drivers/pnp/pnpbios/core.c	2004-10-25 00:08:19 -04:00
@@ -538,6 +538,12 @@
 		return -ENODEV;
 	}
 
+	if (!acpi_disabled) {
+		pnpbios_disabled = 1;
+		printk(KERN_INFO "PnPBIOS: Disabled by ACPI\n");
+		return -ENODEV;
+	}
+
 	/* scan the system for pnpbios support */
 	if (!pnpbios_probe_system())
 		return -ENODEV;

Re: [PATCH] PnP Fixes for 2.6.10-rc1

[Adam Belay]

#   2004/10/24 23:27:24-04:00 nacc@us.ibm.com
#   [PNPBIOS] use msleep_interruptible()
#   
#   Description: Use msleep_interruptible() instead of
#   schedule_timeout() to guarantee the task delays as expected.
#   
#   Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
#   Signed-off-by: Adam Belay <ambx1@neo.rr.com>

diff -Nru a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
--- a/drivers/pnp/pnpbios/core.c	2004-10-25 00:08:14 -04:00
+++ b/drivers/pnp/pnpbios/core.c	2004-10-25 00:08:14 -04:00
@@ -60,6 +60,7 @@
 #include <linux/completion.h>
 #include <linux/spinlock.h>
 #include <linux/dmi.h>
+#include <linux/delay.h>
 
 #include <asm/page.h>
 #include <asm/desc.h>
@@ -177,8 +178,7 @@
 		/*
 		 * Poll every 2 seconds
 		 */
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(HZ*2);
+		msleep_interruptible(2000);
 		if(signal_pending(current))
 			break;
 

Re: [PATCH] PnP Fixes for 2.6.10-rc1

[Adam Belay]

#   2004/10/24 23:42:57-04:00 ambx1@neo.rr.com
#   [PNPBIOS] acpi compile fix
#   
#   Allow PNPBIOS to compile if ACPI support is not enabled.
#   
#   Signed-off-by: Adam Belay <ambx1@neo.rr.com>

diff -Nru a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
--- a/drivers/pnp/pnpbios/core.c	2004-10-25 00:08:09 -04:00
+++ b/drivers/pnp/pnpbios/core.c	2004-10-25 00:08:09 -04:00
@@ -538,11 +538,13 @@
 		return -ENODEV;
 	}
 
+#ifdef CONFIG_ACPI
 	if (!acpi_disabled) {
 		pnpbios_disabled = 1;
 		printk(KERN_INFO "PnPBIOS: Disabled by ACPI\n");
 		return -ENODEV;
 	}
+#endif /* CONFIG_ACPI */
 
 	/* scan the system for pnpbios support */
 	if (!pnpbios_probe_system())