[Xen-devel] Re: [git pull] xen, x86 fixes

[Adrian Bunk <bunk@xxxxxxxxxx>]

On Mon, Jun 23, 2008 at 09:40:55PM +0200, Ingo Molnar wrote:
> Linus,
> 
> please pull the latest x86 fixes tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git 
> x86-fixes-for-linus
> 
> NOTE: contains the second, lguest half of the FPU fixlet from Suresh.
> 
>       Ingo
>...
> Jeremy Fitzhardinge (2):
>...
>       xen: don't drop NX bit
>...
> --- a/arch/x86/xen/mmu.c
> +++ b/arch/x86/xen/mmu.c
>...
>  pmdval_t xen_pmd_val(pmd_t pmd)
>  {
> -     pmdval_t ret = native_pmd_val(pmd);
> -     if (ret & _PAGE_PRESENT)
> -             ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT;
> -     return ret;
> +     return pte_mfn_to_pfn(pmd.pmd);
>  }
>...

Another compile error from the x86 tree:

<--  snip  -->

...
  CC      arch/x86/xen/mmu.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/x86/xen/mmu.c: In function 
‘xen_pmd_val’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/x86/xen/mmu.c:229: error: 
‘pmd_t’ has no member named ‘pmd’
make[2]: *** [arch/x86/xen/mmu.o] Error 1

<--  snip  -->

The problem seems to be related to CONFIG_X86_PAE=n which results in
PAGETABLE_LEVELS == 2.

Not visible in -next due to "xen: remove support for non-PAE 32-bit",
but that is not in 2.6.26.

.config attached.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

.config
Description: Text document

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