xnu-1504.7.4.tar.gz

[apple/xnu.git] / osfmk / kern / ast.h

diff --git a/osfmk/kern/ast.h b/osfmk/kern/ast.h
index 5a6de8d9082f64bf51cd8d974f014391fdafcf33..b6f42e4ec36da25ff3e2d4df830d0a133a3dd1a4 100644 (file)
--- a/osfmk/kern/ast.h
+++ b/osfmk/kern/ast.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2004 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,
  * 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@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -107,6 +113,11 @@ typedef uint32_t           ast_t;
 
 #endif  /* MACHINE_AST */
 
 
 #endif  /* MACHINE_AST */
 

+#define AST_CHUD_URGENT     0x800
+#define AST_CHUD            0x400
+
+#define AST_CHUD_ALL        (AST_CHUD_URGENT|AST_CHUD)
+

 /* Initialize module */
 extern void            ast_init(void);
 
 /* Initialize module */
 extern void            ast_init(void);
 


@@ -171,11 +182,11 @@ MACRO_END
  *  be followed by ast_propagate().
  */
 #define thread_ast_set(act, reason)            \
  *  be followed by ast_propagate().
  */
 #define thread_ast_set(act, reason)            \

-                                               (hw_atomic_or(&(act)->ast, (reason)))
+                                               (hw_atomic_or_noret(&(act)->ast, (reason)))

 #define thread_ast_clear(act, reason)  \
 #define thread_ast_clear(act, reason)  \

-                                               (hw_atomic_and(&(act)->ast, ~(reason)))
+                                               (hw_atomic_and_noret(&(act)->ast, ~(reason)))

 #define thread_ast_clear_all(act)              \
 #define thread_ast_clear_all(act)              \

-                                               (hw_atomic_and(&(act)->ast, AST_NONE))
+                                               (hw_atomic_and_noret(&(act)->ast, AST_NONE))

 
 #ifdef MACH_BSD
 
 
 #ifdef MACH_BSD