Re: [Xen-devel] [PATCH] [HVM] Fix 64 bit PV-on-HVM driver builds

["Dave Lively" <dlively@xxxxxxxxxxxxxxx>]

After further investigation, I see that the PV-on-HVM driver build was
broken only for x86_64 linux kernels PRIOR TO 2.6.11 (i.e., without a
pud_t typedef).  And my original patch breaks the build with kernels
> = 2.6.11.  I had mistakenly thought it was a matter of CONFIG_XEN or
not.  The attached new version of this patch should work with all
(2.6) kernels.  I now test LINUX_VERSION_CODE instead of CONFIG_XEN.

I've also separated this x86_64 case from the i386 case.  We end up
including the same file
(unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h)
in either case, but it was pretty confusing the way I had it mixed in
with the i386 case.

Tested building against 2.6.5, 2.6.9, and 2.6.18 guest kernels.

Dave

On 6/6/07, Keir Fraser <keir@xxxxxxxxxxxxx> wrote:
> This makes no sense. x86/64 drivers build fine for me as is.
>
>  -- Keir
>
>
> On 6/6/07 17:08, "Ben Guthro" <bguthro@xxxxxxxxxxxxxxx> wrote:
>
> > xenbus-drivers-64bit-build-fix.patch:
> > allow unmodified drivers to build under 64 bits
> >
> > Signed-off-by: David Lively <dlively@xxxxxxxxxxxxxxx>
> > diff -r d4a0706d6747
> > linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
> > --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h Tue May
> > 15 15:14:02 2007 +0100
> > +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h Thu May
> > 17 15:01:35 2007 -0400
> > @@ -45,13 +45,15 @@
> >  #include <xen/interface/nmi.h>
> >  #include <asm/ptrace.h>
> >  #include <asm/page.h>
> > -#if defined(__i386__)
> > +
> > +#if !defined(CONFIG_XEN) || defined(__i386__)
> >  #  ifdef CONFIG_X86_PAE
> >  #   include <asm-generic/pgtable-nopud.h>
> >  #  else
> >  #   include <asm-generic/pgtable-nopmd.h>
> >  #  endif
> >  #endif
> > +
> >
> >  extern shared_info_t *HYPERVISOR_shared_info;
> >
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@xxxxxxxxxxxxxxxxxxx
> > http://lists.xensource.com/xen-devel
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel

Attachment: xenbus-drivers-64bit-build-fix.patch
Description: Text Data

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel