Sun Aug 18 09:31:38 2013 UTC ()
Remove ancient spl* variants no longer used


(martin)
diff -r1.52 -r1.53 src/sys/arch/sparc64/include/psl.h
cvs diff -r1.52 -r1.53 src/sys/arch/sparc64/include/psl.h (expand / switch to unified diff)

--- src/sys/arch/sparc64/include/psl.h 2012/11/09 10:05:59 1.52
+++ src/sys/arch/sparc64/include/psl.h 2013/08/18 09:31:38 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: psl.h,v 1.52 2012/11/09 10:05:59 nakayama Exp $ */ 1/* $NetBSD: psl.h,v 1.53 2013/08/18 09:31:38 martin Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1992, 1993 4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This software was developed by the Computer Systems Engineering group 7 * This software was developed by the Computer Systems Engineering group
8 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and 8 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
9 * contributed to Berkeley. 9 * contributed to Berkeley.
10 * 10 *
11 * All advertising materials mentioning features or use of this software 11 * All advertising materials mentioning features or use of this software
12 * must display the following acknowledgement: 12 * must display the following acknowledgement:
13 * This product includes software developed by the University of 13 * This product includes software developed by the University of
14 * California, Lawrence Berkeley Laboratory. 14 * California, Lawrence Berkeley Laboratory.
@@ -476,41 +476,27 @@ SPLHOLD(splsoftint, 1) @@ -476,41 +476,27 @@ SPLHOLD(splsoftint, 1)
476SPLHOLD(splsoftserial, 4) 476SPLHOLD(splsoftserial, 4)
477 477
478/* audio software interrupts are at software level 4 */ 478/* audio software interrupts are at software level 4 */
479SPLHOLD(splausoft, PIL_AUSOFT) 479SPLHOLD(splausoft, PIL_AUSOFT)
480 480
481/* floppy software interrupts are at software level 4 too */ 481/* floppy software interrupts are at software level 4 too */
482SPLHOLD(splfdsoft, PIL_FDSOFT) 482SPLHOLD(splfdsoft, PIL_FDSOFT)
483 483
484/* 484/*
485 * Memory allocation (must be as high as highest network, tty, or disk device) 485 * Memory allocation (must be as high as highest network, tty, or disk device)
486 */ 486 */
487SPLHOLD(splvm, PIL_VM) 487SPLHOLD(splvm, PIL_VM)
488 488
489/* fd hardware interrupts are at level 11 */ 
490SPLHOLD(splfd, PIL_FD) 
491 
492/* zs hardware interrupts are at level 12 */ 
493SPLHOLD(splzs, PIL_SER) 
494SPLHOLD(splserial, PIL_SER) 
495 
496/* audio hardware interrupts are at level 13 */ 
497SPLHOLD(splaudio, PIL_AUD) 
498 
499/* second sparc timer interrupts at level 14 */ 
500SPLHOLD(splstatclock, PIL_STATCLOCK) 
501 
502SPLHOLD(splsched, PIL_SCHED) 489SPLHOLD(splsched, PIL_SCHED)
503SPLHOLD(spllock, PIL_LOCK) 
504 490
505SPLHOLD(splhigh, PIL_HIGH) 491SPLHOLD(splhigh, PIL_HIGH)
506 492
507/* splx does not have a return value */ 493/* splx does not have a return value */
508#ifdef SPLDEBUG 494#ifdef SPLDEBUG
509#define spl0() spl0X(__FILE__, __LINE__) 495#define spl0() spl0X(__FILE__, __LINE__)
510#define splsoftint() splsoftintX(__FILE__, __LINE__) 496#define splsoftint() splsoftintX(__FILE__, __LINE__)
511#define splsoftserial() splsoftserialX(__FILE__, __LINE__) 497#define splsoftserial() splsoftserialX(__FILE__, __LINE__)
512#define splausoft() splausoftX(__FILE__, __LINE__) 498#define splausoft() splausoftX(__FILE__, __LINE__)
513#define splfdsoft() splfdsoftX(__FILE__, __LINE__) 499#define splfdsoft() splfdsoftX(__FILE__, __LINE__)
514#define splvm() splvmX(__FILE__, __LINE__) 500#define splvm() splvmX(__FILE__, __LINE__)
515#define splclock() splclockX(__FILE__, __LINE__) 501#define splclock() splclockX(__FILE__, __LINE__)
516#define splfd() splfdX(__FILE__, __LINE__) 502#define splfd() splfdX(__FILE__, __LINE__)