xnu-517.tar.gz

[apple/xnu.git] / bsd / dev / ppc / km.c

diff --git a/bsd/dev/ppc/km.c b/bsd/dev/ppc/km.c
index e04d3a636d7486957782b9b497538889507a59f4..ea1a6558bbedfb86e5b8af40687ea084f5dc9f6d 100644 (file)
--- a/bsd/dev/ppc/km.c
+++ b/bsd/dev/ppc/km.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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@
  */
@@ -314,7 +317,7 @@ kmtimeout( struct tty *tp)
 
        funnel_state = thread_funnel_set(kernel_flock, TRUE);
        kmoutput(tp);
-       (void) thread_funnel_set(kernel_flock, FALSE);
+       (void) thread_funnel_set(kernel_flock, funnel_state);
 
 
 }
@@ -342,7 +345,7 @@ kmoutput(
                }
        }
         if (tp->t_outq.c_cc > 0) {
-               timeout(kmtimeout, tp, hz);
+               timeout((timeout_fcn_t)kmtimeout, tp, hz);
        }
        tp->t_state &= ~TS_BUSY;
        ttwwakeup(tp);