lkml.org 
[lkml]   [2003]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH] visws: allow SMP kernel build without io_apic.c (1/13)
From
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
pazke@orbita1.ru | PGP key: wwwkeys.pgp.net
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)
{
/*
\
 
 \ /
  Last update: 2005-03-22 13:33    [W:0.034 / U:3.484 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site