Module Name: src
Committed By: dyoung
Date: Sat Feb 6 22:32:08 UTC 2010
Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: Makefile spl.9
src/share/man/man9/man9.i386: Makefile
Added Files:
src/share/man/man9/man9.i386: splraise.9
Log Message:
Move MD spllower(9) and splraise(9) doco from the MI spl(9) to an i386
manual page.
To generate a diff of this commit:
cvs rdiff -u -r1.1386 -r1.1387 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.313 -r1.314 src/share/man/man9/Makefile
cvs rdiff -u -r1.36 -r1.37 src/share/man/man9/spl.9
cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/man9.i386/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man9/man9.i386/splraise.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1386 src/distrib/sets/lists/comp/mi:1.1387
--- src/distrib/sets/lists/comp/mi:1.1386 Fri Feb 5 22:07:14 2010
+++ src/distrib/sets/lists/comp/mi Sat Feb 6 22:32:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1386 2010/02/05 22:07:14 pooka Exp $
+# $NetBSD: mi,v 1.1387 2010/02/06 22:32:07 dyoung Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -8879,6 +8879,8 @@
./usr/share/man/cat9/hz.0 comp-sys-catman .cat
./usr/share/man/cat9/i386/bios32_service.0 comp-sys-catman .cat
./usr/share/man/cat9/i386/bioscall.0 comp-sys-catman .cat
+./usr/share/man/cat9/i386/spllower.0 comp-sys-catman .cat
+./usr/share/man/cat9/i386/splraise.0 comp-sys-catman .cat
./usr/share/man/cat9/i386/return_address.0 comp-sys-catman .cat
./usr/share/man/cat9/ieee80211.0 comp-sys-catman .cat
./usr/share/man/cat9/ieee80211_chan2ieee.0 comp-sys-catman .cat
@@ -9369,10 +9371,10 @@
./usr/share/man/cat9/splclock.0 comp-sys-catman .cat
./usr/share/man/cat9/splhigh.0 comp-sys-catman .cat
./usr/share/man/cat9/splimp.0 comp-sys-catman .cat
-./usr/share/man/cat9/spllower.0 comp-sys-catman .cat
+./usr/share/man/cat9/spllower.0 comp-obsolete obsolete
./usr/share/man/cat9/spllowersoftclock.0 comp-sys-catman .cat
./usr/share/man/cat9/splnet.0 comp-sys-catman .cat
-./usr/share/man/cat9/splraise.0 comp-sys-catman .cat
+./usr/share/man/cat9/splraise.0 comp-obsolete obsolete
./usr/share/man/cat9/splraiseipl.0 comp-sys-catman .cat
./usr/share/man/cat9/splsched.0 comp-sys-catman .cat
./usr/share/man/cat9/splserial.0 comp-sys-catman .cat
@@ -14455,6 +14457,8 @@
./usr/share/man/html9/i386/bios32_service.html comp-sys-htmlman html
./usr/share/man/html9/i386/bioscall.html comp-sys-htmlman html
./usr/share/man/html9/i386/return_address.html comp-sys-htmlman html
+./usr/share/man/html9/i386/spllower.html comp-sys-htmlman html
+./usr/share/man/html9/i386/splraise.html comp-sys-htmlman html
./usr/share/man/html9/ieee80211.html comp-sys-htmlman html
./usr/share/man/html9/ieee80211_chan2ieee.html comp-sys-htmlman html
./usr/share/man/html9/ieee80211_chan2mode.html comp-sys-htmlman html
@@ -14919,10 +14923,10 @@
./usr/share/man/html9/splclock.html comp-sys-htmlman html
./usr/share/man/html9/splhigh.html comp-sys-htmlman html
./usr/share/man/html9/splimp.html comp-sys-htmlman html
-./usr/share/man/html9/spllower.html comp-sys-htmlman html
+./usr/share/man/html9/spllower.html comp-obsolete obsolete
./usr/share/man/html9/spllowersoftclock.html comp-sys-htmlman html
./usr/share/man/html9/splnet.html comp-sys-htmlman html
-./usr/share/man/html9/splraise.html comp-sys-htmlman html
+./usr/share/man/html9/splraise.html comp-obsolete obsolete
./usr/share/man/html9/splraiseipl.html comp-sys-htmlman html
./usr/share/man/html9/splsched.html comp-sys-htmlman html
./usr/share/man/html9/splserial.html comp-sys-htmlman html
@@ -20185,6 +20189,8 @@
./usr/share/man/man9/i386/bios32_service.9 comp-sys-man .man
./usr/share/man/man9/i386/bioscall.9 comp-sys-man .man
./usr/share/man/man9/i386/return_address.9 comp-sys-man .man
+./usr/share/man/man9/i386/spllower.9 comp-sys-man .man
+./usr/share/man/man9/i386/splraise.9 comp-sys-man .man
./usr/share/man/man9/ieee80211.9 comp-sys-man .man
./usr/share/man/man9/ieee80211_chan2ieee.9 comp-sys-man .man
./usr/share/man/man9/ieee80211_chan2mode.9 comp-sys-man .man
@@ -20674,10 +20680,10 @@
./usr/share/man/man9/splclock.9 comp-sys-man .man
./usr/share/man/man9/splhigh.9 comp-sys-man .man
./usr/share/man/man9/splimp.9 comp-sys-man .man
-./usr/share/man/man9/spllower.9 comp-sys-man .man
+./usr/share/man/man9/spllower.9 comp-obsolete obsolete
./usr/share/man/man9/spllowersoftclock.9 comp-sys-man .man
./usr/share/man/man9/splnet.9 comp-sys-man .man
-./usr/share/man/man9/splraise.9 comp-sys-man .man
+./usr/share/man/man9/splraise.9 comp-obsolete obsolete
./usr/share/man/man9/splraiseipl.9 comp-sys-man .man
./usr/share/man/man9/splsched.9 comp-sys-man .man
./usr/share/man/man9/splserial.9 comp-sys-man .man
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.313 src/share/man/man9/Makefile:1.314
--- src/share/man/man9/Makefile:1.313 Tue Jan 26 14:00:38 2010
+++ src/share/man/man9/Makefile Sat Feb 6 22:32:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.313 2010/01/26 14:00:38 jruoho Exp $
+# $NetBSD: Makefile,v 1.314 2010/02/06 22:32:08 dyoung Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -628,8 +628,7 @@
softintr.9 softint_schedule.9
MLINKS+=spl.9 spl0.9 spl.9 splbio.9 spl.9 splclock.9 spl.9 splhigh.9 \
spl.9 splimp.9 \
- spl.9 spllower.9 spl.9 spllowersoftclock.9 spl.9 splnet.9 \
- spl.9 splraise.9 \
+ spl.9 spllowersoftclock.9 spl.9 splnet.9 \
spl.9 splsched.9 spl.9 splserial.9 \
spl.9 splsoftclock.9 spl.9 splsoftnet.9 spl.9 splsoftserial.9 \
spl.9 splstatclock.9 spl.9 spltty.9 spl.9 splvm.9 spl.9 splx.9 \
Index: src/share/man/man9/spl.9
diff -u src/share/man/man9/spl.9:1.36 src/share/man/man9/spl.9:1.37
--- src/share/man/man9/spl.9:1.36 Tue Nov 17 19:34:29 2009
+++ src/share/man/man9/spl.9 Sat Feb 6 22:32:08 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: spl.9,v 1.36 2009/11/17 19:34:29 wiz Exp $
+.\" $NetBSD: spl.9,v 1.37 2010/02/06 22:32:08 dyoung Exp $
.\"
.\" Copyright (c) 2000, 2001 Jason R. Thorpe. All rights reserved.
.\" Copyright (c) 1997 Michael Long.
@@ -32,8 +32,6 @@
.Os
.Sh NAME
.Nm spl ,
-.Nm spllower ,
-.Nm splraise ,
.Nm spl0 ,
.Nm splhigh ,
.Nm splvm ,
@@ -47,10 +45,6 @@
.Sh SYNOPSIS
.In sys/intr.h
.Ft void
-.Fn spllower "int s"
-.Ft int
-.Fn splraise "int s"
-.Ft void
.Fn spl0 void
.Ft int
.Fn splhigh void
@@ -213,34 +207,6 @@
which must be a value previously returned by one of the other
.Nm
functions.
-.Pp
-The
-.Fn spllower
-function sets the system priority level to the one encoded in
-.Fa s ,
-if
-.Fa s
-is lower than the current level.
-Otherwise, it does not change the level.
-Use
-.Fn splx
-instead
-of
-.Fn spllower ,
-except in extraordinary circumstances.
-.Pp
-The
-.Fn splraise
-function sets the system priority level to the one encoded in
-.Fa s ,
-if
-.Fa s
-is greater than the current level, and returns the previous level.
-Otherwise, it does not change the level, and it returns the current level.
-Except in extraordinary circumstances,
-do not use
-.Fn splraise .
-Use one of the priority-raising functions above, instead.
.Sh SEE ALSO
.Xr condvar 9 ,
.Xr mutex 9 ,
Index: src/share/man/man9/man9.i386/Makefile
diff -u src/share/man/man9/man9.i386/Makefile:1.3 src/share/man/man9/man9.i386/Makefile:1.4
--- src/share/man/man9/man9.i386/Makefile:1.3 Tue Nov 3 05:12:11 2009
+++ src/share/man/man9/man9.i386/Makefile Sat Feb 6 22:32:08 2010
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/11/03 05:12:11 dyoung Exp $
+# $NetBSD: Makefile,v 1.4 2010/02/06 22:32:08 dyoung Exp $
-MAN= bioscall.9 bios32_service.9 return_address.9
+MAN= bioscall.9 bios32_service.9 return_address.9 splraise.9
MANSUBDIR=/i386
+MLINKS+=splraise.9 spllower.9
.include <bsd.man.mk>
Added files:
Index: src/share/man/man9/man9.i386/splraise.9
diff -u /dev/null src/share/man/man9/man9.i386/splraise.9:1.1
--- /dev/null Sat Feb 6 22:32:08 2010
+++ src/share/man/man9/man9.i386/splraise.9 Sat Feb 6 22:32:08 2010
@@ -0,0 +1,85 @@
+.\" $NetBSD: splraise.9,v 1.1 2010/02/06 22:32:08 dyoung Exp $
+.\"
+.\" Copyright (c) 2010 David Young. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\" derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd February 5, 2010
+.Dt SPLRAISE 9
+.Os
+.Sh NAME
+.Nm spllower ,
+.Nm splraise
+.Nd modify system interrupt priority level
+.Sh SYNOPSIS
+.In machine/intr.h
+.Ft void
+.Fn spllower "int s"
+.Ft int
+.Fn splraise "int s"
+.Sh DESCRIPTION
+These functions raise and lower the interrupt priority level
+on i386.
+They are used by machine-dependent kernel code to implement
+the machine-independent
+.Xr spl 9
+interface.
+.Pp
+In a multi-CPU system, these functions change the interrupt
+priority level on the local CPU only.
+In general, device drivers should not make use of these functions.
+.Pp
+The
+.Fn spllower
+function sets the system priority level to the one encoded in
+.Fa s ,
+if
+.Fa s
+is lower than the current level.
+Otherwise, it does not change the level.
+Use
+.Fn splx
+instead
+of
+.Fn spllower ,
+except in extraordinary circumstances.
+.Pp
+The
+.Fn splraise
+function sets the system priority level to the one encoded in
+.Fa s ,
+if
+.Fa s
+is greater than the current level, and returns the previous level.
+Otherwise, it does not change the level, and it returns the current level.
+Except in extraordinary circumstances,
+do not use
+.Fn splraise .
+Use one of the priority-raising functions defined in
+.Xr spl 9 ,
+instead.
+.Sh SEE ALSO
+.Xr condvar 9 ,
+.Xr mutex 9 ,
+.Xr rwlock 9 ,
+.Xr spl 9
