ia64/xen-unstable

changeset 4469:9dfa12fa3add

bitkeeper revision 1.1236.57.1 (4252553cg_fYLV1TD86ca_IbSyJ_8w)

unnecessary difference between vanilla and xen

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vh249@arcadians.cl.cam.ac.uk
date Tue Apr 05 09:07:08 2005 +0000 (2005-04-05)
parents 7d50508a59d1
children 3bfb0d7a5f6c
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c	Sun Apr 03 13:17:25 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c	Tue Apr 05 09:07:08 2005 +0000
     1.3 @@ -167,7 +167,7 @@ void show_regs(struct pt_regs * regs)
     1.4  	if (regs->xcs & 2)
     1.5  		printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
     1.6  	printk(" EFLAGS: %08lx    %s  (%s)\n",
     1.7 -	       regs->eflags, print_tainted(),UTS_RELEASE);
     1.8 +	       regs->eflags, print_tainted(), system_utsname.release);
     1.9  	printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
    1.10  		regs->eax,regs->ebx,regs->ecx,regs->edx);
    1.11  	printk("ESI: %08lx EDI: %08lx EBP: %08lx",
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c	Sun Apr 03 13:17:25 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c	Tue Apr 05 09:07:08 2005 +0000
     2.3 @@ -194,7 +194,7 @@ static void __init kernel_physical_mappi
     2.4  			}
     2.5  		}
     2.6  		pmd_idx = 0;
     2.7 -	}	
     2.8 +	}
     2.9  }
    2.10  
    2.11  static inline int page_kills_ppro(unsigned long pagenr)
     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Sun Apr 03 13:17:25 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Tue Apr 05 09:07:08 2005 +0000
     3.3 @@ -9,13 +9,12 @@
     3.4  #include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
     3.5  
     3.6  #define pmd_populate_kernel(mm, pmd, pte) \
     3.7 -	set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
     3.8 +		set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
     3.9  
    3.10 -#define pmd_populate(mm, pmd, pte) do {				\
    3.11 +#define pmd_populate(mm, pmd, pte) 				\
    3.12  	set_pmd(pmd, __pmd(_PAGE_TABLE +			\
    3.13  		((unsigned long long)page_to_pfn(pte) <<	\
    3.14 -			(unsigned long long) PAGE_SHIFT)));	\
    3.15 -} while (0)
    3.16 +			(unsigned long long) PAGE_SHIFT)))
    3.17  /*
    3.18   * Allocate and free page tables.
    3.19   */