ia64/xen-unstable

changeset 13409:3efc6a135cc3

x86/PAE linux: don't restrict upper half of page table entries to 3 bits
when dumping the page table contents during an oops.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Fri Jan 12 14:48:06 2007 +0000 (2007-01-12)
parents bad268302c58
children f159e81e0b44
files linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c	Fri Jan 12 14:46:21 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c	Fri Jan 12 14:48:06 2007 +0000
     1.3 @@ -225,7 +225,7 @@ static void dump_fault_path(unsigned lon
     1.4  	p += (address >> 30) * 2;
     1.5  	printk(KERN_ALERT "%08lx -> *pde = %08lx:%08lx\n", page, p[1], p[0]);
     1.6  	if (p[0] & 1) {
     1.7 -		mfn  = (p[0] >> PAGE_SHIFT) | ((p[1] & 0x7) << 20); 
     1.8 +		mfn  = (p[0] >> PAGE_SHIFT) | (p[1] << 20);
     1.9  		page = mfn_to_pfn(mfn) << PAGE_SHIFT; 
    1.10  		p  = (unsigned long *)__va(page);
    1.11  		address &= 0x3fffffff;
    1.12 @@ -234,7 +234,7 @@ static void dump_fault_path(unsigned lon
    1.13  		       page, p[1], p[0]);
    1.14  #ifndef CONFIG_HIGHPTE
    1.15  		if (p[0] & 1) {
    1.16 -			mfn  = (p[0] >> PAGE_SHIFT) | ((p[1] & 0x7) << 20); 
    1.17 +			mfn  = (p[0] >> PAGE_SHIFT) | (p[1] << 20);
    1.18  			page = mfn_to_pfn(mfn) << PAGE_SHIFT; 
    1.19  			p  = (unsigned long *) __va(page);
    1.20  			address &= 0x001fffff;