1.1 --- a/xen/arch/powerpc/domain_build.c	Thu Jan 25 15:55:25 2007 -0500
     1.2 +++ b/xen/arch/powerpc/domain_build.c	Tue Feb 06 13:42:19 2007 -0600
     1.3 @@ -30,6 +30,7 @@
     1.4  #include <xen/version.h>
     1.5  #include <asm/processor.h>
     1.6  #include <asm/papr.h>
     1.7 +#include <public/arch-powerpc.h>
     1.8  #include "oftree.h"
     1.9  
    1.10  extern int parseelfimage_32(struct domain_setup_info *dsi);

     2.1 --- a/xen/arch/powerpc/mm.c	Thu Jan 25 15:55:25 2007 -0500
     2.2 +++ b/xen/arch/powerpc/mm.c	Tue Feb 06 13:42:19 2007 -0600
     2.3 @@ -28,6 +28,7 @@
     2.4  #include <asm/init.h>
     2.5  #include <asm/page.h>
     2.6  #include <asm/string.h>
     2.7 +#include <public/arch-powerpc.h>
     2.8  
     2.9  #ifdef VERBOSE
    2.10  #define MEM_LOG(_f, _a...)                                  \

     3.1 --- a/xen/include/asm-powerpc/domain.h	Thu Jan 25 15:55:25 2007 -0500
     3.2 +++ b/xen/include/asm-powerpc/domain.h	Tue Feb 06 13:42:19 2007 -0600
     3.3 @@ -107,13 +107,6 @@ extern void load_segments(struct vcpu *)
     3.4  extern void save_float(struct vcpu *);
     3.5  extern void load_float(struct vcpu *);
     3.6  
     3.7 -#define RMA_SHARED_INFO 1
     3.8 -#define RMA_START_INFO 2
     3.9 -#define RMA_LAST_DOM0 2
    3.10 -/* these are not used for dom0 so they should be last */
    3.11 -#define RMA_CONSOLE 3
    3.12 -#define RMA_LAST_DOMU 3
    3.13 -
    3.14  #define rma_size(rma_order) (1UL << ((rma_order) + PAGE_SHIFT))
    3.15  
    3.16  static inline ulong rma_addr(struct arch_domain *ad, int type)

     4.1 --- a/xen/include/public/arch-powerpc.h	Thu Jan 25 15:55:25 2007 -0500
     4.2 +++ b/xen/include/public/arch-powerpc.h	Tue Feb 06 13:42:19 2007 -0600
     4.3 @@ -117,6 +117,14 @@ struct arch_shared_info {
     4.4  struct arch_vcpu_info {
     4.5  };
     4.6  
     4.7 +#define RMA_SHARED_INFO 1
     4.8 +#define RMA_START_INFO 2
     4.9 +#define RMA_LAST_DOM0 2
    4.10 +/* these are not used for dom0 so they should be last */
    4.11 +#define RMA_CONSOLE 3
    4.12 +#define RMA_STORE 4
    4.13 +#define RMA_LAST_DOMU 4
    4.14 +
    4.15  /* Support for multi-processor guests. */
    4.16  #define MAX_VIRT_CPUS 32
    4.17  #endif