kern/37695: MI change to interrupt levels broke ARM BUILDS

[mfouts%danger.com@localhost]

>Number:         37695
>Category:       kern
>Synopsis:       MI change to interrupt levels broke ARM BUILDS
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jan 05 01:05:00 +0000 2008
>Originator:     Marty Fouts
>Release:        current
>Organization:
Danger
>Environment:
evbarm
>Description:
Recent MI changes that removed some ipl definitions broke kernel builds for 
almost all arm targets. here is an example failure:

#   compile  OSK5912/omap_rtc.o
/home/marty/projects/netbsd/current/evbarm/tools/bin/arm--netbsdelf-gcc 
-mcpu=arm926ej-s -ffreestanding -fno-zero-initialized-in-bss -O2 -Werror -Wall 
-Wno-main -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes 
-Wstrict-prototypes -Wswitch -Wshadow -Wcast-qual -Wwrite-strings 
-Wno-sign-compare -Wno-pointer-sign -Wno-attributes -fno-strict-aliasing -I. 
-I/home/marty/projects/netbsd/current/src/sys/../common/include 
-I/home/marty/projects/netbsd/current/src/sys/arch 
-I/home/marty/projects/netbsd/current/src/sys -nostdinc -DDIAGNOSTIC 
-DVERBOSE_INIT_ARM -DMAXUSERS=32 -D_KERNEL -D_KERNEL_OPT 
-I/home/marty/projects/netbsd/current/src/sys/lib/libkern/../../../common/lib/libc/quad
 
-I/home/marty/projects/netbsd/current/src/sys/lib/libkern/../../../common/lib/libc/string
 
-I/home/marty/projects/netbsd/current/src/sys/lib/libkern/../../../common/lib/libc/arch/arm/string
 -c /home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_rtc.c
--- omap_intr.o ---
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c:77: 
error: 'IPL_SOFT' undeclared here (not in a function)
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c: In 
function 'omapintc_attach':
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c:175: 
error: 'SI_SOFT' undeclared (first use in this function)
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c:175: 
error: (Each undeclared identifier is reported only once
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c:175: 
error: for each function it appears in.)
cc1: warnings being treated as errors
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c: In 
function 'soft_interrupt':
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c:341: 
warning: implicit declaration of function 'softintr_dispatch'
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c: In 
function 'init_interrupt_masks':
/home/marty/projects/netbsd/current/src/sys/arch/arm/omap/omap_intr.c:404: 
error: 'SI_SOFT' undeclared (first use in this function)
*** [omap_intr.o] Error code 1
--- omap_mputmr.o ---
*** [omap_mputmr.o] Error code 1
2 errors

nbmake: stopped in 
/home/marty/projects/netbsd/current/evbarm/obj/sys/arch/evbarm/compile/OSK5912

>How-To-Repeat:
sync current
build any arm kernel. I tried OSK5912 for this example.
>Fix: