Module Name: src
Committed By: matt
Date: Sat Apr 19 00:33:24 UTC 2014
Modified Files:
src/sys/arch/arm/include: cpufunc.h cpufunc_proto.h
Log Message:
Move xscale cpu_cpwait back from cpufunc_proto.ht to cpufunc.h
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/arm/include/cpufunc.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/include/cpufunc_proto.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.72 src/sys/arch/arm/include/cpufunc.h:1.73
--- src/sys/arch/arm/include/cpufunc.h:1.72 Mon Apr 14 20:50:47 2014
+++ src/sys/arch/arm/include/cpufunc.h Sat Apr 19 00:33:24 2014
@@ -233,6 +233,11 @@ u_int cpufunc_faultaddress (void);
#define setttb cpu_setttb
#define drain_writebuf cpu_drain_writebuf
+
+#if defined(CPU_XSCALE)
+#define cpu_cpwait() cpufuncs.cf_cpwait()
+#endif
+
#ifndef cpu_cpwait
#define cpu_cpwait()
#endif
Index: src/sys/arch/arm/include/cpufunc_proto.h
diff -u src/sys/arch/arm/include/cpufunc_proto.h:1.1 src/sys/arch/arm/include/cpufunc_proto.h:1.2
--- src/sys/arch/arm/include/cpufunc_proto.h:1.1 Mon Apr 14 20:50:47 2014
+++ src/sys/arch/arm/include/cpufunc_proto.h Sat Apr 19 00:33:24 2014
@@ -385,7 +385,6 @@ void ixp12x0_setup (char *);
#if defined(CPU_XSCALE)
void xscale_cpwait (void);
-#define cpu_cpwait() cpufuncs.cf_cpwait()
void xscale_cpu_sleep (int);
