From: Andres Lagar-Cavilla Date: Thu, 3 May 2012 16:21:09 +0000 (+0100) Subject: x86/mm: Eliminate _shadow_mode_refcounts X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e164d0d20c0c9fbe6989b78f73975e5654c0866;p=xen.git x86/mm: Eliminate _shadow_mode_refcounts Replace its only useer with paging_mode_refcounts(). Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 6d81f98d83..f10a1c572b 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2165,7 +2165,7 @@ int get_page(struct page_info *page, struct domain *domain) if ( owner != NULL ) put_page(page); - if ( !_shadow_mode_refcounts(domain) && !domain->is_dying ) + if ( !paging_mode_refcounts(domain) && !domain->is_dying ) gdprintk(XENLOG_INFO, "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info "\n", diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index cda1c56201..59be993ec0 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -105,11 +105,6 @@ static int __init shadow_audit_key_init(void) __initcall(shadow_audit_key_init); #endif /* SHADOW_AUDIT */ -int _shadow_mode_refcounts(struct domain *d) -{ - return shadow_mode_refcounts(d); -} - /**************************************************************************/ /* x86 emulator support for the shadow code diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index bc3e4dc01d..4f8ac4c2ff 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -331,7 +331,6 @@ static inline void *__page_to_virt(const struct page_info *pg) int free_page_type(struct page_info *page, unsigned long type, int preemptible); -int _shadow_mode_refcounts(struct domain *d); int is_iomem_page(unsigned long mfn);