xnu-344.21.74.tar.gz

[apple/xnu.git] / osfmk / i386 / AT386 / mp / mp.h

diff --git a/osfmk/i386/AT386/mp/mp.h b/osfmk/i386/AT386/mp/mp.h
index e63593cf1da7cca6a817a1532c7a2b5ac654efe9..a444c5aeb9eca9a247d4f670b93f8091a473cd09 100644 (file)
--- a/osfmk/i386/AT386/mp/mp.h
+++ b/osfmk/i386/AT386/mp/mp.h
@@ -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@
  */
@@ -67,8 +70,8 @@
 #define CPU_NUMBER(r) \
        movl    EXT(lapic_id), r  ; \
        movl    0(r),r            ; \
-       shrl    $LAPIC_ID_SHIFT, r; \
-       andl    $LAPIC_ID_MASK, r
+       shrl    $ LAPIC_ID_SHIFT, r; \
+       andl    $ LAPIC_ID_MASK, r
 
 
 #define        MP_IPL          SPL6    /* software interrupt level */
@@ -125,11 +128,11 @@ extern    int     kdb_active[];
 
 #if    MACH_RT
 #define _DISABLE_PREEMPTION(r)                                         \
-       movl    $CPD_PREEMPTION_LEVEL,r                 ;       \
+       movl    $ CPD_PREEMPTION_LEVEL,r                        ;       \
        incl    %gs:(r)
 
 #define _ENABLE_PREEMPTION(r)                                  \
-       movl    $CPD_PREEMPTION_LEVEL,r                 ;       \
+       movl    $ CPD_PREEMPTION_LEVEL,r                        ;       \
        decl    %gs:(r)                                 ;       \
        jne     9f                                      ;       \
        pushl   %eax                                    ;       \
@@ -142,7 +145,7 @@ extern      int     kdb_active[];
 9:     
 
 #define _ENABLE_PREEMPTION_NO_CHECK(r)                         \
-       movl    $CPD_PREEMPTION_LEVEL,r                 ;       \
+       movl    $ CPD_PREEMPTION_LEVEL,r                        ;       \
        decl    %gs:(r)
 
 #if    MACH_ASSERT