diff options
| author | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2006-01-03 08:59:00 -0600 |
|---|---|---|
| committer | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2006-01-03 08:59:00 -0600 |
| commit | fe8281c24dede8ae0aa380e96f519a2762d632f0 (patch) | |
| tree | 9de86e3be6e1f3c13f555c62bc1ba52afbb151b3 | |
| parent | b6a15a2cb8ffc78a2cd1832f2952a7d3ad25450f (diff) | |
| download | xen-fe8281c24dede8ae0aa380e96f519a2762d632f0.tar.gz xen-fe8281c24dede8ae0aa380e96f519a2762d632f0.tar.bz2 xen-fe8281c24dede8ae0aa380e96f519a2762d632f0.zip | |
Small bug fixes
| -rw-r--r-- | linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h | 2 | ||||
| -rw-r--r-- | xen/arch/ia64/xen/domain.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h index e0b41f57ea..e1bcb49913 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypercall.h @@ -372,7 +372,7 @@ HYPERVISOR_memory_op( int ret; __asm__ __volatile__ ( ";; mov r14=%2 ; mov r15=%3 ; mov r2=%1 ; break 0x1000 ;; mov %0=r8 ;;" : "=r" (ret) - : "i" (__HYPERVISOR_console_io), "r"(cmd), "r"(arg) + : "i" (__HYPERVISOR_memory_op), "r"(cmd), "r"(arg) : "r14","r15","r2","r8","memory" ); return ret; } diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index eafd6dda5a..21209d8987 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -419,7 +419,7 @@ extern unsigned long vhpt_paddr, vhpt_pend; { p = alloc_domheap_page(d); // zero out pages for security reasons - memset(__va(page_to_phys(p)),0,PAGE_SIZE); + if (p) memset(__va(page_to_phys(p)),0,PAGE_SIZE); } if (unlikely(!p)) { printf("map_new_domain_page: Can't alloc!!!! Aaaargh!\n"); |