X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..cf7d32b81c573a0536dc4da4157f9c26f8d0bed3:/osfmk/kern/ast.c

diff --git a/osfmk/kern/ast.c b/osfmk/kern/ast.c
index a0181460f..f0b75b59a 100644
--- a/osfmk/kern/ast.c
+++ b/osfmk/kern/ast.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 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@
@@ -74,10 +79,7 @@
 #include <kern/spl.h>
 #include <kern/wait_queue.h>
 #include <mach/policy.h>
-
-#ifdef __ppc__
-#include <ppc/trap.h> // for CHUD AST hook
-#endif
+#include <machine/trap.h> // for CHUD AST hook
 
 void
 ast_init(void)
@@ -97,12 +99,11 @@ ast_taken(
 	ast_t			*myast = ast_pending();
 	thread_t		thread = current_thread();
 
-#ifdef __ppc__
 	/*
 	 * CHUD hook - all threads including idle processor threads
 	 */
 	if(perfASTHook) {
-		if(*myast & AST_PPC_CHUD_ALL) {
+		if(*myast & AST_CHUD_ALL) {
 			perfASTHook(0, NULL, 0, 0);
 			
 			if(*myast == AST_NONE) {
@@ -110,9 +111,8 @@ ast_taken(
 			}
 		}
 	} else {
-		*myast &= ~AST_PPC_CHUD_ALL;
+		*myast &= ~AST_CHUD_ALL;
 	}
-#endif
 
 	reasons &= *myast;
 	*myast &= ~reasons;
@@ -190,12 +190,12 @@ void
 ast_check(
 	processor_t		processor)
 {
-	register thread_t		thread = processor->active_thread;
+	thread_t			thread = processor->active_thread;
 
 	processor->current_pri = thread->sched_pri;
 	if (	processor->state == PROCESSOR_RUNNING		||
 			processor->state == PROCESSOR_SHUTDOWN		) {
-		register ast_t		preempt;
+		ast_t			preempt;
 
 		/*
 		 *	Propagate thread ast to processor.