From owner-p4-projects@FreeBSD.ORG  Mon Mar  2 19:25:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C232C1065B79; Mon,  2 Mar 2009 19:25:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 368301065A4A
	for <perforce@FreeBSD.org>; Mon,  2 Mar 2009 19:25:58 +0000 (UTC)
	(envelope-from antab@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 20F1B8FC2E
	for <perforce@FreeBSD.org>; Mon,  2 Mar 2009 19:25:58 +0000 (UTC)
	(envelope-from antab@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22JPwmT030818
	for <perforce@FreeBSD.org>; Mon, 2 Mar 2009 19:25:58 GMT
	(envelope-from antab@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22JPv9c030815
	for perforce@freebsd.org; Mon, 2 Mar 2009 19:25:57 GMT
	(envelope-from antab@FreeBSD.org)
Date: Mon, 2 Mar 2009 19:25:57 GMT
Message-Id: <200903021925.n22JPv9c030815@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	antab@FreeBSD.org using -f
From: Arnar Mar Sig <antab@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 158593 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Mar 2009 19:26:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=158593

Change 158593 by antab@antab_farm on 2009/03/02 19:25:27

	Move readX and writeX around to make world build
	Add avr32 to gprof

Affected files ...

.. //depot/projects/avr32/src/sys/avr32/include/cpufunc.h#4 edit
.. //depot/projects/avr32/src/usr.bin/gprof/avr32.h#1 add
.. //depot/projects/avr32/src/usr.bin/gprof/gprof.h#2 edit

Differences ...

==== //depot/projects/avr32/src/sys/avr32/include/cpufunc.h#4 (text+ko) ====

@@ -34,6 +34,11 @@
 
 #include <sys/types.h>
 
+register_t intr_disable(void);
+void intr_restore(register_t s);
+
+#endif	/* _KERNEL */
+
 #define readb(va)	(*(volatile uint8_t *) (va))
 #define readw(va)	(*(volatile uint16_t *) (va))
 #define readl(va)	(*(volatile uint32_t *) (va))
@@ -42,11 +47,6 @@
 #define writew(va, d)	(*(volatile uint16_t *) (va) = (d))
 #define writel(va, d)	(*(volatile uint32_t *) (va) = (d))
 
-register_t intr_disable(void);
-void intr_restore(register_t s);
-
-#endif	/* _KERNEL */
-
 static __inline void
 breakpoint(void)
 {

==== //depot/projects/avr32/src/usr.bin/gprof/gprof.h#2 (text+ko) ====

@@ -47,6 +47,9 @@
 #if __arm__
 #   include "arm.h"
 #endif
+#if __avr32__
+#   include "avr32.h"
+#endif
 #if __i386__
 #   include "i386.h"
 #endif