> > Your tree is corrupt, looks like flipped bits (its gone from 'a' to ^A)
>
> Naah, that's just me pasting text into joe and forgetting to fix it up
> afterwards. :)
Seems I screwed up that bit of the merge and pulled in the prototype not
final sis_apic bits. Apply this on top
--- include/asm-i386/io_apic.h~ 2002-11-26 12:39:26.000000000 +0000
+++ include/asm-i386/io_apic.h 2002-11-26 12:42:17.000000000 +0000
@@ -125,7 +125,8 @@
*/
static inline void io_apic_modify(unsigned int apic, unsigned int
reg, unsigned int value)
{
- if(apic_sis_bug)
+ extern int sis_apic_bug;
+ if(sis_apic_bug)
*IO_APIC_BASE(apic) = reg;
*(IO_APIC_BASE(apic)+4) = value;
}
--- drivers/pci/quirks.c~ 2002-11-26 12:43:57.000000000 +0000
+++ drivers/pci/quirks.c 2002-11-26 12:43:57.000000000 +0000
@@ -350,8 +350,9 @@
static void __init quirk_ioapic_rmw(struct pci_dev *dev)
{
+ extern int sis_apic_bug;
if(dev->devfn == 0 && dev->bus->number == 0)
- apic_sys_bug = 1;
+ sis_apic_bug = 1;
}
-
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/
This archive was generated by hypermail 2b29 : Sat Nov 30 2002 - 22:00:13 EST