Isaku Yamahata
2009-Mar-05 02:53 UTC
[Xen-devel] [PATCH] Remove compilation warning and typo caused by 19268:4b7d638a8b89
[IA64] Remove compilation warning and typo caused by 19268:4b7d638a8b89 This patch fixes the issue of 19268:4b7d638a8b89 which causes the following panic. (XEN) Xen BUG at page_alloc.c:400 (XEN) FIXME: implement ia64 dump_execution_state() (XEN) (XEN) Call Trace: (XEN) [<f4000000040fbf10>] show_stack+0x90/0xb0 (XEN) sp=f0000002fdd37c00 bsp=f0000002fdd317a0 (XEN) [<f4000000040fca20>] dump_stack+0x30/0x50 (XEN) sp=f0000002fdd37dd0 bsp=f0000002fdd31780 (XEN) [<f4000000040609d0>] __bug+0x70/0xa0 (XEN) sp=f0000002fdd37dd0 bsp=f0000002fdd31750 (XEN) [<f40000000402f510>] alloc_heap_pages+0x650/0x8a0 (XEN) sp=f0000002fdd37dd0 bsp=f0000002fdd316d8 (XEN) [<f40000000402f8b0>] alloc_domheap_pages+0x150/0x340 (XEN) sp=f0000002fdd37dd0 bsp=f0000002fdd31680 (XEN) [<f4000000040a5700>] pgtable_quicklist_alloc+0x60/0x120 (XEN) sp=f0000002fdd37dd0 bsp=f0000002fdd31658 (XEN) [<f4000000040a7180>] lookup_alloc_domain_pte+0x190/0x300 (XEN) sp=f0000002fdd37dd0 bsp=f0000002fdd31610 (XEN) [<f4000000040a7320>] __assign_domain_page+0x30/0x2f0 (XEN) sp=f0000002fdd37dd0 bsp=f0000002fdd31590 (XEN) [<f4000000040a7790>] assign_domain_mmio_page+0x1b0/0x230 (XEN) sp=f0000002fdd37de0 bsp=f0000002fdd31540 (XEN) [<f40000000407ff60>] do_dom0vp_op+0x670/0x730 (XEN) sp=f0000002fdd37df0 bsp=f0000002fdd314f8 (XEN) [<f400000004002e30>] fast_hypercall+0x170/0x340 (XEN) sp=f0000002fdd37e00 bsp=f0000002fdd314f8 (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Xen BUG at page_alloc.c:400 (XEN) **************************************** (XEN) (XEN) Reboot in five seconds... Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> diff --git a/xen/common/xencomm.c b/xen/common/xencomm.c --- a/xen/common/xencomm.c +++ b/xen/common/xencomm.c @@ -51,7 +51,7 @@ xencomm_get_page(unsigned long paddr, st return -EFAULT; *page = maddr_to_page(maddr); - if ( !get_page(*page, current->domain) == 0 ) + if ( get_page(*page, current->domain) == 0 ) { /* * This page might be a page granted by another domain, or this page diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h --- a/xen/include/asm-ia64/mm.h +++ b/xen/include/asm-ia64/mm.h @@ -200,7 +200,8 @@ static inline void put_page(struct page_ free_domheap_page(page); } -static inline page_get_owner_and_reference(struct page_info *page) +static inline struct domain *page_get_owner_and_reference( + struct page_info *page) { unsigned long x, y = page->count_info; @@ -226,7 +227,6 @@ static inline int get_page(struct page_i return 1; put_page(page); -fail: /* if (!domain->is_dying) */ /* XXX: header inclusion hell */ gdprintk(XENLOG_INFO, "Error pfn %lx: rd=%p, od=%p, caf=%016lx, taf=%" PRtype_info "\n", -- yamahata _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel