xnu-2422.90.20.tar.gz

[apple/xnu.git] / bsd / kern / spl.c

diff --git a/bsd/kern/spl.c b/bsd/kern/spl.c
index 4ab15677d42013d75167f3bedb6436a697a43843..1078cdc8a4454f4ac2188f3830e4a8172c1bfd30 100644 (file)
--- a/bsd/kern/spl.c
+++ b/bsd/kern/spl.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <machine/machine_routines.h>
 #include <machine/spl.h>
@@ -27,8 +33,6 @@ unsigned
 sploff(
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "sploff()");
         return(0);
 }
 
@@ -36,8 +40,6 @@ unsigned
 splhigh(
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splhigh()");
         return(0);
 }
 
@@ -45,8 +47,6 @@ unsigned
 splsched(
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splsched()");
         return(0);
 }
 
@@ -54,8 +54,6 @@ unsigned
 splclock (
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splclock()");
         return(0);
 }
 
@@ -63,8 +61,6 @@ unsigned
 splpower (
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splpower()");
         return(0);
 }
 
@@ -72,8 +68,6 @@ unsigned
 splvm(
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splvm()");
         return(0);
 }
 
@@ -81,8 +75,6 @@ unsigned
 splbio (
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splbio()");
         return(0);
 }
 
@@ -90,16 +82,12 @@ unsigned
 splimp(
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splimp()");
         return(0);
 }
 
 unsigned
 spltty(void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "spltty()");
         return(0);
 }
 
@@ -107,55 +95,42 @@ unsigned
 splnet(
        void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splnet()");
        return(0);
 }
 
 unsigned
 splsoftclock(void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splsoftclock()");
         return(0);
 }
 
 void
 spllo(void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "spllo()");
         return;
 }
 
 void
 spl0(void)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "spl0()");
         return;
 }
 
 void
-spln(unsigned t)
+spln(__unused unsigned t)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "spln()");
         return;
 }
 
 void
-splx(unsigned l)
+splx(__unused unsigned l)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splx()");
        return;
 }
 
 void
-splon(unsigned l)
+splon(__unused unsigned l)
 {
-        if(thread_funnel_get() == THR_FUNNEL_NULL)
-                panic("%s not under funnel", "splon()");
        return;
 }
+