Module Name:	src
Committed By:	liamjfoy
Date:		Tue Aug 28 19:33:25 UTC 2007

Modified Files:
	src/sys/arch/shark/isa [netbsd-4]: clock.c isa_irq.S

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #844):
	sys/arch/shark/isa/isa_irq.S: revision 1.8
	sys/arch/shark/isa/clock.c: revision 1.15
Make clockintr() return 1 since it's always handled so that
clock interrupt is properly acounted by evcnt(9) in isa_irq.S.

In irq_setmasks(), refer spl_masks[current_spl_level] directly
rather than spl_mask which is a saved value in splraise() and
splx() functions because the latter one is not always sync'ed with
current_spl_level and interrupt state could be mangled.
Okay'ed by chris@, and should close PR port-shark/22355.


To generate a diff of this commit:
cvs rdiff -r1.13 -r1.13.4.1 src/sys/arch/shark/isa/clock.c
cvs rdiff -r1.4 -r1.4.24.1 src/sys/arch/shark/isa/isa_irq.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.