Attachment 299479 Details for Bug 439380 – RHEL5 patch to fix this issue

[patch] RHEL5 patch to fix this issue

patch-v2 (text/plain), 2.88 KB, created by Prarit Bhargava on 2008-03-28 15:06:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-03-28 15:06:33 UTC

Size: 2.88 KB

patch

obsolete

>diff -urNp -X linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/Documentation/kernel-parameters.txt linux-2.6.18.i386/Documentation/kernel-parameters.txt
>--- linux-2.6.18.i386.orig/Documentation/kernel-parameters.txt	2008-03-27 05:39:36.000000000 -0400
>+++ linux-2.6.18.i386/Documentation/kernel-parameters.txt	2008-03-28 05:41:43.000000000 -0400
>@@ -564,6 +564,10 @@ running once the system is up.
> 
> 	gamma=		[HW,DRM]
> 
>+	generic_bay_driver=
>+			[HW]
>+			Enable(1) or disable(0) the generic ACPI bay driver
>+
> 	gdth=		[HW,SCSI]
> 			See header of drivers/scsi/gdth.c.
> 
>diff -urNp -X linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/drivers/acpi/bay.c linux-2.6.18.i386/drivers/acpi/bay.c
>--- linux-2.6.18.i386.orig/drivers/acpi/bay.c	2008-03-27 05:39:36.000000000 -0400
>+++ linux-2.6.18.i386/drivers/acpi/bay.c	2008-03-28 06:54:38.000000000 -0400
>@@ -31,6 +31,7 @@
> #include <linux/seq_file.h>
> #include <asm/uaccess.h>
> #include <linux/platform_device.h>
>+#include <linux/dmi.h>
> 
> ACPI_MODULE_NAME("bay");
> MODULE_AUTHOR("Kristen Carlson Accardi");
>@@ -360,10 +361,55 @@ find_bay(acpi_handle handle, u32 lvl, vo
> 	return AE_OK;
> }
> 
>+static unsigned int generic_bay_driver = 1;
>+static unsigned int override_bay_driver = 0;
>+
>+static int __init setup_generic_bay_driver(char *str)
>+{
>+	int value;
>+
>+	override_bay_driver = 1;
>+	get_option(&str, &value);
>+	generic_bay_driver = value;
>+
>+	return 1;
>+}
>+
>+/* generic_bay_driver can have values of 0 or 1 */
>+__setup("generic_bay_driver=", setup_generic_bay_driver);
>+
>+static int __init private_bay_driver(struct dmi_system_id *d)
>+{
>+	generic_bay_driver = 0;
>+
>+	return 0;
>+}
>+
>+static struct dmi_system_id __initdata private_driver_table[] = {
>+	{
>+		.callback = private_bay_driver,
>+		.ident = "Lenovo T60 laptop",
>+		.matches = {DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T60"),},
>+	},
>+	{
>+		.callback = private_bay_driver,
>+		.ident = "Lenovo T61 laptop",
>+		.matches = {DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"),},
>+	},
>+
>+	{ }
>+};
>+
> static int __init bay_init(void)
> {
> 	int bays = 0;
> 
>+	if (!override_bay_driver)
>+		dmi_check_system(private_driver_table);
>+
>+	if (!generic_bay_driver)
>+		return -EBUSY;
>+
> 	INIT_LIST_HEAD(&drive_bays);
> 
> 	/* look for dockable drive bays */
>diff -urNp -X linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/drivers/acpi/ibm_acpi.c linux-2.6.18.i386/drivers/acpi/ibm_acpi.c
>--- linux-2.6.18.i386.orig/drivers/acpi/ibm_acpi.c	2008-03-27 05:39:36.000000000 -0400
>+++ linux-2.6.18.i386/drivers/acpi/ibm_acpi.c	2008-03-28 05:58:15.000000000 -0400
>@@ -162,6 +162,7 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK",	/* 
> IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST",	/* 570 */
> 	   "\\_SB.PCI0.IDE0.IDES.IDSM",	/* 600e/x, 770e, 770x */
> 	   "\\_SB.PCI0.SATA.SCND.MSTR",	/* T60, X60, Z60 */ 
>+	   "\\_SB.PCI0.IDE0.PRIM.MSTR",	/* T61 */ 
> 	   "\\_SB.PCI0.IDE0.SCND.MSTR",	/* all others */
>     );				/* A21e, R30, R31 */
>

Actions: View | Diff

Attachments on bug 439380: 299477 | 299479