Remove unused XENMAPSPACE_mfn

Not present in any stable release of Xen. Introduced for qemu-dm but
not needed.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index 0483ce40f1dd139b23438a3c08e4ea82803e165c..3583b3c27b8961563f4ca7c925e4026150a8a517 100644 (file)
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -3295,13 +3295,12 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
 
             spin_unlock(&d->grant_table->lock);
             break;
-        case XENMAPSPACE_gmfn:
-            xatp.idx = gmfn_to_mfn(d, xatp.idx);
-        case XENMAPSPACE_mfn: {
+        case XENMAPSPACE_gmfn: {
             struct xen_ia64_memmap_info memmap_info;
             efi_memory_desc_t md;
             int ret;
 
+            xatp.idx = gmfn_to_mfn(d, xatp.idx);
             if ( !get_page_from_pagenr(xatp.idx, d) )
                 break;
 

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 13bffee00b9e2e98f864713772e0d782afe56661..7cf13378069d126dd07c70cf4d773a55017b80d5 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -3810,7 +3810,6 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
             break;
         case XENMAPSPACE_gmfn:
             xatp.idx = gmfn_to_mfn(d, xatp.idx);
-        case XENMAPSPACE_mfn:
             if ( !get_page_from_pagenr(xatp.idx, d) )
                 break;
             mfn = xatp.idx;

diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
index f0f502c3ee1eac0e50d45a55e83e238e097a13e2..ba4051e95fe05d019bf34b6db8ed315f4a11b183 100644 (file)
--- a/xen/include/public/memory.h
+++ b/xen/include/public/memory.h
@@ -206,8 +206,7 @@ struct xen_add_to_physmap {
     /* Source mapping space. */
 #define XENMAPSPACE_shared_info 0 /* shared info page */
 #define XENMAPSPACE_grant_table 1 /* grant table page */
-#define XENMAPSPACE_mfn         2 /* MFN */
-#define XENMAPSPACE_gmfn        3 /* GMFN */
+#define XENMAPSPACE_gmfn        2 /* GMFN */
     unsigned int space;
 
     /* Index into source mapping space. */