Re: 2.6.7-rc3-mm1

William Lee Irwin III
2004-06-09T15:16:12Z

On Wed, Jun 09, 2004 at 07:58:49AM -0700, William Lee Irwin III wrote:
> Actually I think blowing it away immediately is best. Bounds checks
> don't work for everything.

(a) fix mach-default compile due to missing definition of BAD_APICID
(b) fix UP APIC sans IO-APIC link failure

Index: mm1-2.6.7-rc3/include/asm-i386/mach-default/mach_apic.h
===================================================================
--- mm1-2.6.7-rc3.orig/include/asm-i386/mach-default/mach_apic.h 2004-06-09 08:08:00.000000000 -0700
+++ mm1-2.6.7-rc3/include/asm-i386/mach-default/mach_apic.h 2004-06-09 08:10:17.000000000 -0700
@@ -2,6 +2,7 @@
#define __ASM_MACH_APIC_H

#include <mach_apicdef.h>
+#include <asm/smp.h>

#define APIC_DFR_VALUE (APIC_DFR_FLAT)

Index: mm1-2.6.7-rc3/arch/i386/kernel/io_apic.c
===================================================================
--- mm1-2.6.7-rc3.orig/arch/i386/kernel/io_apic.c 2004-06-09 08:08:00.000000000 -0700
+++ mm1-2.6.7-rc3/arch/i386/kernel/io_apic.c 2004-06-09 08:13:05.000000000 -0700
@@ -722,17 +722,6 @@

__setup("pirq=", ioapic_pirq_setup);

-int get_physical_broadcast(void)
-{
- unsigned int lvr, version;
- lvr = apic_read(APIC_LVR);
- version = GET_APIC_VERSION(lvr);
- if (version >= 0x14)
- return 0xff;
- else
- return 0xf;
-}
-
/*
* Find the IRQ entry number of a certain pin.
*/
Index: mm1-2.6.7-rc3/arch/i386/kernel/apic.c
===================================================================
--- mm1-2.6.7-rc3.orig/arch/i386/kernel/apic.c 2004-06-09 08:06:44.000000000 -0700
+++ mm1-2.6.7-rc3/arch/i386/kernel/apic.c 2004-06-09 08:13:27.000000000 -0700
@@ -80,6 +80,17 @@
apic_write_around(APIC_LVT0, v);
}

+int get_physical_broadcast(void)
+{
+ unsigned int lvr, version;
+ lvr = apic_read(APIC_LVR);
+ version = GET_APIC_VERSION(lvr);
+ if (version >= 0x14)
+ return 0xff;
+ else
+ return 0xf;
+}
+
int get_maxlvt(void)
{
unsigned int v, ver, maxlvt;