WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] Re: __supported_pte_mask |= _PAGE_IOMAP twice?

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] Re: __supported_pte_mask |= _PAGE_IOMAP twice?
From: Josip Rodin <joy@xxxxxxxxxxxxxx>
Date: Sun, 22 Aug 2010 14:13:16 +0200
Delivery-date: Sun, 22 Aug 2010 05:13:49 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20100822120636.GA32564@xxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20100822120636.GA32564@xxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.18 (2008-05-17)
On Sun, Aug 22, 2010 at 02:06:36PM +0200, joy wrote:
> Hi,
> 
> I don't really understand this, but in xen-2.6.36/dom0/core there's this:
> 
> % git diff 0c2b1aa4c31830d3b9a40061d1b5f6c8cd837d57 
> 057e5006127460b11e03bf80227881c528b0590d
> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> index 167ca78..0850bd6 100644
> --- a/arch/x86/xen/enlighten.c
> +++ b/arch/x86/xen/enlighten.c
> @@ -1195,12 +1195,12 @@ asmlinkage void __init xen_start_kernel(void)
>  
>         pgd = (pgd_t *)xen_start_info->pt_base;
>  
> -       if (xen_initial_domain())
> -               __supported_pte_mask |= _PAGE_IOMAP;
> -       else
> +       if (!xen_initial_domain())
>                 __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
>  
>         __supported_pte_mask |= _PAGE_IOMAP;
> +
> +       __supported_pte_mask |= _PAGE_IOMAP;
>         /* Don't do the full vcpu_info placement stuff until we have a
>            possible map and a non-dummy shared_info. */
>         per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
> 
> 
> What's the point of doing the same thing twice at the end? Maybe it's
> a mis-merge?

It looks like it, because in:

% git diff 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 xen/dom0/core

...that hunk is just:

@@ -1031,6 +1066,8 @@ asmlinkage void __init xen_start_kernel(void)
        if (!xen_initial_domain())
                __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
 
+       __supported_pte_mask |= _PAGE_IOMAP;
+
 #ifdef CONFIG_X86_64
        /* Work out if we support NX */
        check_efer();

-- 
     2. That which causes joy or happiness.

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

<Prev in Thread] Current Thread [Next in Thread>