From: Stefano Stabellini Date: Tue, 9 Oct 2012 14:05:33 +0000 (+0100) Subject: xen/arm: implement get/put_page_type X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7774 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=48d56ac850f6ae8857a7e0b6d7b92335f8d90553;p=xen.git xen/arm: implement get/put_page_type Add a basic get_page_type and put_page_type implementation: we don't care about typecounts so just return success. Also remove PGT_shared_page, that is unused. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S index aaf1ff1471..022338aeee 100644 --- a/xen/arch/arm/dummy.S +++ b/xen/arch/arm/dummy.S @@ -22,10 +22,6 @@ DUMMY(arch_get_info_guest); DUMMY(arch_vcpu_reset); NOP(update_vcpu_system_time); -/* Page Reference & Type Maintenance */ -DUMMY(get_page_type); -DUMMY(put_page_type); - /* Grant Tables */ DUMMY(steal_page); diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 69bd21e919..25e74a6dfd 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -574,6 +574,19 @@ int get_page(struct page_info *page, struct domain *domain) return 0; } +/* Common code requires get_page_type and put_page_type. + * We don't care about typecounts so we just do the minimum to make it + * happy. */ +int get_page_type(struct page_info *page, unsigned long type) +{ + return 1; +} + +void put_page_type(struct page_info *page) +{ + return; +} + void gnttab_clear_flag(unsigned long nr, uint16_t *addr) { /* diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 53801b0190..b37bd35513 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -71,7 +71,6 @@ struct page_info #define PGT_none PG_mask(0, 4) /* no special uses of this page */ #define PGT_writable_page PG_mask(7, 4) /* has writable mappings? */ -#define PGT_shared_page PG_mask(8, 4) /* CoW sharable page */ #define PGT_type_mask PG_mask(15, 4) /* Bits 28-31 or 60-63. */ /* Owning guest has pinned this page to its current type? */