[PATCH] visws: allow SMP kernel build without io_apic.c (1/13)

[Andrey Panin]

This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-8357-1045227913-0001-2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi.

I'm here again, starting another hopeless attempt to submmit
visws subarch support for 2.5. This series of patches was tested
by me and brave people from linux-visws-devel mailing list and
our beloved workstations seem to work well under 2.5.xx.

This patch moves enable_NMI_through_LVT0() function from io_apic.c
to apic.c to allow SMP kernel build without io_apic.c included.

Please consider applying.

Best regards.

-- 
Andrey Panin		| Embedded systems software developer
[e-mail]	| PGP key: wwwkeys.pgp.net

--=_courier-8357-1045227913-0001-2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=patch-apic

diff -urN -X /usr/share/dontdiff linux-2.5.60.vanilla/arch/i386/kernel/apic.c linux-2.5.60/arch/i386/kernel/apic.c
--- linux-2.5.60.vanilla/arch/i386/kernel/apic.c	Thu Feb 13 20:29:07 2003
+++ linux-2.5.60/arch/i386/kernel/apic.c	Thu Feb 13 20:42:02 2003
@@ -54,6 +54,18 @@
 int prof_old_multiplier[NR_CPUS] = { 1, };
 int prof_counter[NR_CPUS] = { 1, };
 
+void enable_NMI_through_LVT0 (void * dummy)
+{
+	unsigned int v, ver;
+
+	ver = apic_read(APIC_LVR);
+	ver = GET_APIC_VERSION(ver);
+	v = APIC_DM_NMI;			/* unmask and set to NMI */
+	if (!APIC_INTEGRATED(ver))		/* 82489DX */
+		v |= APIC_LVT_LEVEL_TRIGGER;
+	apic_write_around(APIC_LVT0, v);
+}
+
 int get_maxlvt(void)
 {
 	unsigned int v, ver, maxlvt;
diff -urN -X /usr/share/dontdiff linux-2.5.60.vanilla/arch/i386/kernel/io_apic.c linux-2.5.60/arch/i386/kernel/io_apic.c
--- linux-2.5.60.vanilla/arch/i386/kernel/io_apic.c	Thu Feb 13 20:29:06 2003
+++ linux-2.5.60/arch/i386/kernel/io_apic.c	Thu Feb 13 20:42:02 2003
@@ -1807,18 +1807,6 @@
 	end_lapic_irq
 };
 
-void enable_NMI_through_LVT0 (void * dummy)
-{
-	unsigned int v, ver;
-
-	ver = apic_read(APIC_LVR);
-	ver = GET_APIC_VERSION(ver);
-	v = APIC_DM_NMI;			/* unmask and set to NMI */
-	if (!APIC_INTEGRATED(ver))		/* 82489DX */
-		v |= APIC_LVT_LEVEL_TRIGGER;
-	apic_write_around(APIC_LVT0, v);
-}
-
 static void setup_nmi (void)
 {
 	/*

--=_courier-8357-1045227913-0001-2--