ia64/xen-unstable

changeset 9042:6060937db0fe

merge
author Ian.Campbell@xensource.com
date Mon Feb 27 11:02:00 2006 +0000 (2006-02-27)
parents b75d80269ff4 57cd768791d1
children ee8041b0ab86
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Mon Feb 27 10:59:31 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Mon Feb 27 11:02:00 2006 +0000
     1.3 @@ -176,6 +176,7 @@ ENTRY(cpu_gdt_table)
     1.4  	.ascii  ",FEATURES=writable_page_tables"
     1.5  	.ascii	         "|writable_descriptor_tables"
     1.6  	.ascii	         "|auto_translated_physmap"
     1.7 +	.ascii	         "|pae_pgdir_above_4gb"
     1.8  	.ascii	         "|supervisor_mode_kernel"
     1.9  #ifdef CONFIG_X86_PAE
    1.10  	.ascii	",PAE=yes"