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 afc8d5a24929ae97f7a119738e32ef23da756d89..b6f42e4ec36da25ff3e2d4df830d0a133a3dd1a4 100644 (file)
--- a/osfmk/kern/ast.h
+++ b/osfmk/kern/ast.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * 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.
+ * 
+ * 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
@@ -18,7 +23,7 @@
  * 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@
@@ -108,6 +113,11 @@ typedef uint32_t           ast_t;
 
 #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);
 
@@ -172,11 +182,11 @@ MACRO_END
  *  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)  \
-                                               (hw_atomic_and(&(act)->ast, ~(reason)))
+                                               (hw_atomic_and_noret(&(act)->ast, ~(reason)))
 #define thread_ast_clear_all(act)              \
-                                               (hw_atomic_and(&(act)->ast, AST_NONE))
+                                               (hw_atomic_and_noret(&(act)->ast, AST_NONE))
 
 #ifdef MACH_BSD