[XenPPC] [xenppc-unstable] [XEN][POWERPC] Correct mismerge.

[Xen patchbot-xenppc-unstable <patchbot-xenppc-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Node ID 6902fa91b65717f86defc81edd2162c04bfbf972
# Parent  cba69616bda048eb946f06e926694183832298e2
[XEN][POWERPC] Correct mismerge.
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 xen/include/asm-powerpc/mm.h   |    9 ---------
 xen/include/asm-powerpc/page.h |    2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff -r cba69616bda0 -r 6902fa91b657 xen/include/asm-powerpc/mm.h
--- a/xen/include/asm-powerpc/mm.h      Tue Sep 12 12:20:45 2006 -0500
+++ b/xen/include/asm-powerpc/mm.h      Tue Sep 12 14:26:47 2006 -0500
@@ -234,15 +234,6 @@ extern int update_grant_va_mapping(unsig
                                    struct domain *,
                                    struct vcpu *);
 
-#define INVALID_MFN (~0UL)
-#define PFN_TYPE_NONE 0
-#define PFN_TYPE_RMA 1
-#define PFN_TYPE_LOGICAL 2
-#define PFN_TYPE_IO 3
-#define PFN_TYPE_FOREIGN 4
-
-extern ulong pfn2mfn(struct domain *d, ulong pfn, int *type);
-
 /* Arch-specific portion of memory_op hypercall. */
 long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg);
 
diff -r cba69616bda0 -r 6902fa91b657 xen/include/asm-powerpc/page.h
--- a/xen/include/asm-powerpc/page.h    Tue Sep 12 12:20:45 2006 -0500
+++ b/xen/include/asm-powerpc/page.h    Tue Sep 12 14:26:47 2006 -0500
@@ -118,7 +118,7 @@ static inline int get_order_from_pages(u
 #define PFN_TYPE_RMA 1
 #define PFN_TYPE_LOGICAL 2
 #define PFN_TYPE_IO 3
-#define PFN_TYPE_REMOTE 4
+#define PFN_TYPE_FOREIGN 4
 
 extern ulong pfn2mfn(struct domain *d, ulong pfn, int *type);
 extern unsigned long paddr_to_maddr(unsigned long paddr);

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel