[current tinderbox] failure on powerpc/powerpc

[Joseph Koshy]

>>>> "tb" == "FreeBSD Tinderbox" wrote:

tb> ===> hwpmc (all)
tb> cc -O2 -pipe  -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE
-nostdinc -I-   -include
/tinderbox/CURRENT/powerpc/powerpc/obj/powerpc/tinderbox/CURRENT/powerpc/powerpc/src/sys/GENERIC/opt_global.h
-I. -I@ -I@/contrib/altq -I@/../include -finline-limit=15000
-fno-common -g -mlongcall -fno-omit-frame-pointer
-I/tinderbox/CURRENT/powerpc/powerpc/obj/powerpc/tinderbox/CURRENT/powerpc/powerpc/src/sys/GENERIC
-msoft-float -ffreestanding -Wall -Wredundant-decls -Wnested-externs
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline
-Wcast-qual  -fformat-extensions -std=c99 -Wsystem-headers -Werror
-Wall -Wno-format-y2k -Wno-uninitialized -c
/tinderbox/CURRENT/powerpc/powerpc/src/sys/modules/hwpmc/../../dev/hwpmc/hwpmc_mod.c
tb> In file included from @/sys/pmc.h:35,
tb>                  from
/tinderbox/CURRENT/powerpc/powerpc/src/sys/modules/hwpmc/../../dev/hwpmc/hwpmc_mod.c:41:
tb> ./machine/profile.h:40: error: redefinition of typedef 'uintfptr_t'
tb> @/sys/types.h:285: error: previous declaration of 'uintfptr_t' was here
tb> *** Error code 1

The attached patch brings PPC in line with the other
architectures.  Could someone please review?


-- 
FreeBSD Volunteer,     http://people.freebsd.org/~jkoshy
-------------- next part --------------
Index: sys/powerpc/include/profile.h
===================================================================
RCS file: /cvs/FreeBSD/src/sys/powerpc/include/profile.h,v
retrieving revision 1.4
diff -u -r1.4 profile.h
--- sys/powerpc/include/profile.h	7 Jan 2005 02:29:19 -0000	1.4
+++ sys/powerpc/include/profile.h	11 Jun 2005 01:43:04 -0000
@@ -37,7 +37,6 @@
 #define FUNCTION_ALIGNMENT 16
 
 typedef u_int	fptrdiff_t;
-typedef u_int	uintfptr_t;
 
 #define	MCOUNT \
 void \
@@ -63,6 +62,11 @@
 	    ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr :	\
 		(uintfptr_t)btrap) : ~0U)
 
-#endif
+
+#else	/* !_KERNEL */
+
+typedef u_int	uintfptr_t;
+
+#endif	/* _KERNEL */
 
 #endif /* !_MACHINE_PROFILE_H_ */