From: Justin Pryzby <justinpryzby@users.sourceforge.net>
To: linux-kernel@vger.kernel.org, fdavis@si.rr.com,
justinpryzby@users.sourceforge.net
Subject: Re: [PATCH] 2.5.49-ac1 : include/asm-386/io_apic.h
Date: Tue, 26 Nov 2002 01:07:27 -0500 [thread overview]
Message-ID: <20021126060727.GA28353@perseus.homeunix.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 1829 bytes --]
I had to work a slightly larger patch than Frank. Note that I am assuming that
s/PCI_VENDOR_ID_SIS/PCI_VENDOR_ID_SI/ is correct, as PCI_VENDOR_ID_SIS shows up
nowhere in the kernel tree.
Please CC me in all replies.
Justin
diff -Naur linux.2.5.49-ac1/drivers/pci/quirks.c linux.2.5.49-ac1-jp/drivers/pci/quirks.c
--- linux.2.5.49-ac1/drivers/pci/quirks.c 2002-11-26 00:28:18.000000000 -0500
+++ linux.2.5.49-ac1-jp/drivers/pci/quirks.c 2002-11-26 00:20:47.000000000 -0500
@@ -19,6 +19,8 @@
#include <linux/init.h>
#include <linux/delay.h>
+static int sis_apic_bug;
+
#undef DEBUG
/* Deal with broken BIOS'es that neglect to enable passive release,
@@ -351,7 +353,7 @@
static void __init quirk_ioapic_rmw(struct pci_dev *dev)
{
if(dev->devfn == 0 && dev->bus->number == 0)
- apic_sys_bug = 1;
+ sis_apic_bug = 1;
}
@@ -561,7 +563,7 @@
#ifdef CONFIG_X86_IO_APIC
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_ioapic },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410, quirk_amd_ioapic },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SIS, PCI_ANY_ID, quirk_ioapic_rmw },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw },
#endif
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_acpi },
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_acpi },
diff -Naur linux.2.5.49-ac1/include/asm-i386/io_apic.h linux.2.5.49-ac1-jp/include/asm-i386/io_apic.h
--- linux.2.5.49-ac1/include/asm-i386/io_apic.h 2002-11-26 00:28:19.000000000 -0500
+++ linux.2.5.49-ac1-jp/include/asm-i386/io_apic.h 2002-11-25 23:57:35.000000000 -0500
@@ -11,6 +11,8 @@
* Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
*/
+extern int sis_apic_bug;
+
#ifdef CONFIG_X86_IO_APIC
#define APIC_MISMATCH_DEBUG
[-- Attachment #2: Patch for undefined: acpi_sis_bug --]
[-- Type: text/plain, Size: 1601 bytes --]
diff -Naur linux.2.5.49-ac1/drivers/pci/quirks.c linux.2.5.49-ac1-jp/drivers/pci/quirks.c
--- linux.2.5.49-ac1/drivers/pci/quirks.c 2002-11-26 00:28:18.000000000 -0500
+++ linux.2.5.49-ac1-jp/drivers/pci/quirks.c 2002-11-26 00:20:47.000000000 -0500
@@ -19,6 +19,8 @@
#include <linux/init.h>
#include <linux/delay.h>
+static int sis_apic_bug;
+
#undef DEBUG
/* Deal with broken BIOS'es that neglect to enable passive release,
@@ -351,7 +353,7 @@
static void __init quirk_ioapic_rmw(struct pci_dev *dev)
{
if(dev->devfn == 0 && dev->bus->number == 0)
- apic_sys_bug = 1;
+ sis_apic_bug = 1;
}
@@ -561,7 +563,7 @@
#ifdef CONFIG_X86_IO_APIC
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_ioapic },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410, quirk_amd_ioapic },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SIS, PCI_ANY_ID, quirk_ioapic_rmw },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw },
#endif
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_acpi },
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_acpi },
diff -Naur linux.2.5.49-ac1/include/asm-i386/io_apic.h linux.2.5.49-ac1-jp/include/asm-i386/io_apic.h
--- linux.2.5.49-ac1/include/asm-i386/io_apic.h 2002-11-26 00:28:19.000000000 -0500
+++ linux.2.5.49-ac1-jp/include/asm-i386/io_apic.h 2002-11-25 23:57:35.000000000 -0500
@@ -11,6 +11,8 @@
* Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
*/
+extern int sis_apic_bug;
+
#ifdef CONFIG_X86_IO_APIC
#define APIC_MISMATCH_DEBUG
next reply other threads:[~2002-11-26 6:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-11-26 6:07 Justin Pryzby [this message]
-- strict thread matches above, loose matches on Subject: below --
2002-11-26 2:26 Frank Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20021126060727.GA28353@perseus.homeunix.net \
--to=justinpryzby@users.sourceforge.net \
--cc=fdavis@si.rr.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®