[XenPPC] [xenppc-unstable] [ppc] match upstream changes

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

# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Node ID d3e181fa238b93c616bd010edd45f707c359cf99
# Parent  91ee504ed40e4513e196673d0554260904f1ce4f
[ppc] match upstream changes
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 config/ppc64.mk            |    4 ++++
 xen/arch/ppc/setup.c       |    1 -
 xen/include/asm-ppc/page.h |    4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff -r 91ee504ed40e -r d3e181fa238b xen/arch/ppc/setup.c
--- a/xen/arch/ppc/setup.c      Fri Jun 02 12:31:48 2006 -0500
+++ b/xen/arch/ppc/setup.c      Fri Jun 02 12:54:22 2006 -0500
@@ -65,7 +65,6 @@ ulong isa_io_base;
 ulong isa_io_base;
 struct ns16550_defaults ns16550;
 
-struct vcpu *idle_vcpu[NR_CPUS];
 extern void idle_loop(void);
 
 /* move us to a header file */
diff -r 91ee504ed40e -r d3e181fa238b xen/include/asm-ppc/page.h
--- a/xen/include/asm-ppc/page.h        Fri Jun 02 12:31:48 2006 -0500
+++ b/xen/include/asm-ppc/page.h        Fri Jun 02 12:54:22 2006 -0500
@@ -48,6 +48,10 @@ typedef struct { unsigned long l1_lo; } 
 /* Shorthand versions of the above functions. */
 #define __pa(x)             (virt_to_maddr(x))
 #define __va(x)             (maddr_to_virt(x))
+
+/* Convert between Xen-heap virtual addresses and machine frame numbers. */
+#define virt_to_mfn(va)     (virt_to_maddr(va) >> PAGE_SHIFT)
+#define mfn_to_virt(mfn)    (maddr_to_virt(mfn << PAGE_SHIFT))
 
 /* Convert between machine frame numbers and page-info structures. */
 #define mfn_to_page(mfn)    (frame_table + (mfn))
diff -r 91ee504ed40e -r d3e181fa238b config/ppc64.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/config/ppc64.mk   Fri Jun 02 12:54:22 2006 -0500
@@ -0,0 +1,4 @@
+CONFIG_POWERPC := y
+
+CFLAGS += -DELFSIZE=64
+LIBDIR := lib

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