ia64/xen-unstable

changeset 8440:903fb46f240e

Small bug fixes
author djm@kirby.fc.hp.com
date Tue Jan 03 08:59:00 2006 -0600 (2006-01-03)
parents 45c4e735fc8c
children cd914808acf1
files linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h xen/arch/ia64/xen/domain.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h	Fri Dec 30 23:40:13 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h	Tue Jan 03 08:59:00 2006 -0600
     1.3 @@ -372,7 +372,7 @@ HYPERVISOR_memory_op(
     1.4      int ret;
     1.5      __asm__ __volatile__ ( ";; mov r14=%2 ; mov r15=%3 ; mov r2=%1 ; break 0x1000 ;; mov %0=r8 ;;"
     1.6          : "=r" (ret)
     1.7 -        : "i" (__HYPERVISOR_console_io), "r"(cmd), "r"(arg)
     1.8 +        : "i" (__HYPERVISOR_memory_op), "r"(cmd), "r"(arg)
     1.9          : "r14","r15","r2","r8","memory" );
    1.10      return ret;
    1.11  }
     2.1 --- a/xen/arch/ia64/xen/domain.c	Fri Dec 30 23:40:13 2005 -0600
     2.2 +++ b/xen/arch/ia64/xen/domain.c	Tue Jan 03 08:59:00 2006 -0600
     2.3 @@ -419,7 +419,7 @@ extern unsigned long vhpt_paddr, vhpt_pe
     2.4  		{
     2.5  			p = alloc_domheap_page(d);
     2.6  			// zero out pages for security reasons
     2.7 -			memset(__va(page_to_phys(p)),0,PAGE_SIZE);
     2.8 +			if (p) memset(__va(page_to_phys(p)),0,PAGE_SIZE);
     2.9  		}
    2.10  		if (unlikely(!p)) {
    2.11  printf("map_new_domain_page: Can't alloc!!!! Aaaargh!\n");