Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/powerpc/include/cpu.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/powerpc/include/cpu.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.88.6.3
retrieving revision 1.89
diff -u -p -r1.88.6.3 -r1.89
--- src/sys/arch/powerpc/include/cpu.h	2012/04/29 23:04:41	1.88.6.3
+++ src/sys/arch/powerpc/include/cpu.h	2011/12/13 11:03:52	1.89
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.88.6.3 2012/04/29 23:04:41 mrg Exp $	*/
+/*	$NetBSD: cpu.h,v 1.89 2011/12/13 11:03:52 kiyohara Exp $	*/
 
 /*
  * Copyright (C) 1999 Wolfgang Solfrank.
@@ -213,12 +213,8 @@ curcpu(void)
 	return ci;
 }
 
-#ifdef __clang__
-#define	curlwp			(curcpu()->ci_curlwp)
-#else
 register struct lwp *powerpc_curlwp __asm("r13");
 #define	curlwp			powerpc_curlwp
-#endif
 #define curpcb			(curcpu()->ci_curpcb)
 #define curpm			(curcpu()->ci_curpm)
 
@@ -448,7 +444,6 @@ void	__syncicache(void *, size_t);
 #define	CPU_POWERSAVE		8	/* int: use CPU powersave mode */
 #define	CPU_BOOTED_DEVICE	9	/* string: device we booted from */
 #define	CPU_BOOTED_KERNEL	10	/* string: kernel we booted */
-#define	CPU_EXECPROT		11	/* bool: PROT_EXEC works */
-#define	CPU_MAXID		12	/* number of valid machdep ids */
+#define	CPU_MAXID		11	/* number of valid machdep ids */
 
 #endif	/* _POWERPC_CPU_H_ */