two acpi_disable's are bad for kernel

PATCH Pavel Machek 1 participant 1 message Jan 3, 2004

lore

Share & tools

lore

Pavel Machek

author

2004-01-03 12:38 UTC #0 lore raw

Hi!

acpi_disable() is there already to disable interrupts. Its bad idea to have two functions of same name. Please apply,

Pavel

arch/i386/kernel/dmi_scan.c +2 -2

Index: linux.new/arch/i386/kernel/dmi_scan.c
===================================================================
@@ -506,7 +507,7 @@
 
 extern int acpi_disabled, acpi_force;
 
-static __init __attribute__((unused)) int acpi_disable(struct dmi_blacklist *d) 
+static __init __attribute__((unused)) int disable_acpi(struct dmi_blacklist *d) 
 { 
 	if (!acpi_force) { 
 		printk(KERN_NOTICE "%s detected: acpi off\n",d->ident);

@@ -880,7 +881,7 @@
 	 *	Boxes that need ACPI disabled
 	 */
 
-	{ acpi_disable, "IBM Thinkpad", {
+	{ disable_acpi, "IBM Thinkpad", {
 			MATCH(DMI_BOARD_VENDOR, "IBM"),
 			MATCH(DMI_BOARD_NAME, "2629H1G"),
 			NO_MATCH, NO_MATCH }},

Signature · 2 lines

When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]