X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..ff6e181ae92fc6f1e89841290f461d1f2f9badd9:/osfmk/ppc/cpu_data.h

diff --git a/osfmk/ppc/cpu_data.h b/osfmk/ppc/cpu_data.h
index 34c2ff7ea..22ff7330f 100644
--- a/osfmk/ppc/cpu_data.h
+++ b/osfmk/ppc/cpu_data.h
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * 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
@@ -30,48 +28,31 @@
 #ifndef	PPC_CPU_DATA
 #define PPC_CPU_DATA
 
-typedef struct
-{
-	int		preemption_level;
-	int		simple_lock_count;
-	int		interrupt_level;
-} cpu_data_t;
+#ifdef	MACH_KERNEL_PRIVATE
 
-#define disable_preemption			_disable_preemption
-#define enable_preemption			_enable_preemption
-#define enable_preemption_no_check		_enable_preemption_no_check
-#define mp_disable_preemption			_disable_preemption
-#define mp_enable_preemption			_enable_preemption
-#define mp_enable_preemption_no_check		_enable_preemption_no_check
+#include <mach/mach_types.h>
+#include <machine/thread.h>
 
-extern __inline__ thread_act_t current_act(void) 
+extern thread_t current_thread(void);
+extern __inline__ thread_t current_thread(void) 
 {
-	thread_act_t act;
-	__asm__ volatile("mfsprg %0,1" : "=r" (act));  
-	return act;
-};
+	thread_t	result;
 
-/*
- *	Note that the following function is ONLY guaranteed when preemption or interrupts are disabled
- */
-extern __inline__ struct per_proc_info *getPerProc(void) 
-{
-	struct per_proc_info *perproc;
-	__asm__ volatile("mfsprg %0,0" : "=r" (perproc));  
-	return perproc;
-};
+	__asm__ volatile("mfsprg %0,1" : "=r" (result));
 
-#define	current_thread()	current_act()->thread
+	return (result);
+}
 
-extern void					set_machine_current_act(thread_act_t);
+#define	getPerProc()		current_thread()->machine.PerProc
 
 extern int 					get_preemption_level(void);
-extern void 					disable_preemption(void);
-extern void 					enable_preemption(void);
-extern void 					enable_preemption_no_check(void);
-extern void 					mp_disable_preemption(void);
-extern void 					mp_enable_preemption(void);
-extern void 					mp_enable_preemption_no_check(void);
-extern int 					get_simple_lock_count(void);
+extern void 					_enable_preemption_no_check(void);
+
+#define enable_preemption_no_check()		_enable_preemption_no_check()
+#define mp_disable_preemption()			_disable_preemption()
+#define mp_enable_preemption()			_enable_preemption()
+#define mp_enable_preemption_no_check()		_enable_preemption_no_check()
+
+#endif	/* MACH_KERNEL_PRIVATE */
 
 #endif	/* PPC_CPU_DATA */