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

PATCH New Andrey Panin 1 participant 1 message Feb 14, 2003

lore

Share & tools

lore

Andrey Panin

author

2003-02-14 12:53 UTC #0 lore raw

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

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.

Signature · 2 lines

Andrey Panin		| Embedded systems software developer
[email protected]	| PGP key: wwwkeys.pgp.net

arch/i386/kernel/apic.c +12 -0

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
@@ -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;

arch/i386/kernel/io_apic.c +0 ~~-12~~

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
@@ -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)
 {
 	/*