Update of /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32333/ruby-2.6/arch/i386/kernel
Modified Files:
setup.c
Log Message:
sync to 2.6.2
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/arch/i386/kernel/setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setup.c 5 Feb 2004 11:53:56 -0000 1.5
+++ setup.c 9 Feb 2004 07:31:07 -0000 1.6
@@ -78,13 +78,10 @@
EXPORT_SYMBOL(acpi_disabled);
#ifdef CONFIG_ACPI_BOOT
- int acpi_irq __initdata = 1; /* enable IRQ */
- int acpi_ht __initdata = 1; /* enable HT */
+extern int __initdata acpi_ht;
+int __initdata acpi_force = 0;
#endif
-int acpi_force __initdata = 0;
-
-
int MCA_bus;
/* for MCA, but anyone else can use it if they want */
unsigned int machine_id;
@@ -573,7 +570,7 @@
/* "pci=noacpi" disables ACPI interrupt routing */
else if (!memcmp(from, "pci=noacpi", 10)) {
- acpi_irq = 0;
+ acpi_noirq_set();
}
#ifdef CONFIG_X86_LOCAL_APIC
|
