--Boundary-00=_uyE2G8wFZhF3bPe
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Friday 31 August 2007 17:34:08 Andrew Doran wrote:
> Hi Christoph,
>
> On Fri, Aug 31, 2007 at 11:19:26AM +0200, Christoph Egger wrote:
> > Your last vmlocking merge in -current broke Xen Dom0 build:
> > Xen DomU still builds.
> >
> >
> > cc1: warnings being treated as errors
> > ../../../../arch/x86/x86/bus_dma.c: In function '_bus_dmamem_map':
> > ../../../../arch/x86/x86/bus_dma.c:1053: warning: implicit declaration of
> > function 'x86_atomic_setbits_l'
> > ../../../../arch/x86/x86/bus_dma.c: In function '_bus_dmamem_unmap':
> > ../../../../arch/x86/x86/bus_dma.c:1098: warning: implicit declaration of
> > function 'x86_atomic_clearbits_l'
> > *** [bus_dma.o] Error code 1
> > 1 error
>
> Odd. Do you have local modifications, and is your tree up to date? It
> builds for me and my source tree has no diffs.
>
> Andrew

The attached patch makes this one file build again. But there is more to do
to make the dom0 kernel build again.

Christoph

--Boundary-00=_uyE2G8wFZhF3bPe
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="xen_pmap.h.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="xen_pmap.h.diff"

Index: pmap.h
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/include/pmap.h,v
retrieving revision 1.11
diff -u -p -r1.11 pmap.h
--- pmap.h	29 Aug 2007 23:38:06 -0000	1.11
+++ pmap.h	31 Aug 2007 11:31:57 -0000
@@ -47,6 +47,7 @@
 
 #include "opt_xen.h"
 
+#include <machine/atomic.h>
 #include <machine/cpufunc.h>
 #include <machine/pte.h>
 #include <machine/xenfunc.h>

--Boundary-00=_uyE2G8wFZhF3bPe--