[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xen-cvs
Subject:    [Xen-changelog] merge
From:       Xen patchbot -unstable <patchbot-unstable () lists ! xensource ! com>
Date:       2006-02-27 12:50:09
Message-ID: E1FDhpJ-0005jX-VG () xenbits ! xensource ! com
[Download RAW message or body]

# HG changeset patch
# User Ian.Campbell@xensource.com
# Node ID 6060937db0fe568d34b83d015ebe22b86194faa9
# Parent  b75d80269ff454c90bbcc3f4a91baeb5136864b0
# Parent  57cd768791d1a2bfd1532b2287038c74c21d36d7
merge

diff -r b75d80269ff4 -r 6060937db0fe linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
--- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Mon Feb 27 10:59:31 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Mon Feb 27 11:02:00 2006
@@ -176,6 +176,7 @@
 	.ascii  ",FEATURES=writable_page_tables"
 	.ascii	         "|writable_descriptor_tables"
 	.ascii	         "|auto_translated_physmap"
+	.ascii	         "|pae_pgdir_above_4gb"
 	.ascii	         "|supervisor_mode_kernel"
 #ifdef CONFIG_X86_PAE
 	.ascii	",PAE=yes"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]