xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] merge

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] merge
From:	Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Mon, 04 Jun 2007 03:15:18 -0700
Delivery-date:	Mon, 04 Jun 2007 03:24:37 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1179994558 -3600
# Node ID 1e097a48db065457e84647641097b7b55f86d9b1
# Parent  8c2986a922d37e6a9eac701ec9a0b092a78ceb14
# Parent  a40967e39652fee1edebfddec4b533bdded923a1
merge
---
 linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 8c2986a922d3 -r 1e097a48db06 
linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c    Thu May 24 09:10:43 
2007 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c    Thu May 24 09:15:58 
2007 +0100
@@ -580,7 +580,7 @@ void __init xen_init_pt(void)
 
        /* Construct mapping of initial pte page in our own directories. */
        init_level4_pgt[pgd_index(__START_KERNEL_map)] = 
-               mk_kernel_pgd(__pa_symbol(level3_kernel_pgt));
+               mk_kernel_pgd(__pa_symbol(level3_kernel_pgt) | _PAGE_USER);
        level3_kernel_pgt[pud_index(__START_KERNEL_map)] = 
                __pud(__pa_symbol(level2_kernel_pgt) |
                      _KERNPG_TABLE);

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] merge, Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] [IA64] Return ENOMEM if VPD allocation failed, Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] [IA64] Fix allocate_rid_range(), Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] [IA64] Return ENOMEM if VPD allocation failed, Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] [IA64] Fix allocate_rid_range(), Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]