[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 d6a49aaee3122e14a1bb7583fd03cdcd8bd2e480
# Parent  b29806fb6ba093cfe30e815e99e5abe08e6a0b7a
[ppc] match upstream changes
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 xen/arch/ppc/ppc64/traps.c      |    7 ++++++-
 xen/arch/ppc/setup.c            |    5 ++---
 xen/include/asm-ppc/processor.h |    6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff -r b29806fb6ba0 -r d6a49aaee312 xen/arch/ppc/ppc64/traps.c
--- a/xen/arch/ppc/ppc64/traps.c        Mon Jun 26 14:53:55 2006 -0500
+++ b/xen/arch/ppc/ppc64/traps.c        Mon Jun 26 16:08:27 2006 -0500
@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (C) IBM Corp. 2005
+ * Copyright (C) IBM Corp. 2005, 2006
  *
  * Authors: Hollis Blanchard <hollisb@xxxxxxxxxx>
  */
@@ -43,3 +43,8 @@ void show_registers(struct cpu_user_regs
     }
     console_end_sync();
 }
+
+void show_execution_state(struct cpu_user_regs *regs)
+{
+    show_registers(regs);
+}
diff -r b29806fb6ba0 -r d6a49aaee312 xen/arch/ppc/setup.c
--- a/xen/arch/ppc/setup.c      Mon Jun 26 14:53:55 2006 -0500
+++ b/xen/arch/ppc/setup.c      Mon Jun 26 16:08:27 2006 -0500
@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (C) IBM Corp. 2005
+ * Copyright (C) IBM Corp. 2005, 2006
  *
  * Authors: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
  */
@@ -302,8 +302,7 @@ static void __init __start_xen(multiboot
 
     init_trace_bufs();
 
-    /* Give up the VGA console if DOM0 is configured to grab it. */
-    console_endboot(cmdline && strstr(cmdline, "tty0"));
+    console_endboot();
 
     /* Hide UART from DOM0 if we're using it */
     serial_endboot();
diff -r b29806fb6ba0 -r d6a49aaee312 xen/include/asm-ppc/processor.h
--- a/xen/include/asm-ppc/processor.h   Mon Jun 26 14:53:55 2006 -0500
+++ b/xen/include/asm-ppc/processor.h   Mon Jun 26 16:08:27 2006 -0500
@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (C) IBM Corp. 2005
+ * Copyright (C) IBM Corp. 2005, 2006
  *
  * Authors: Hollis Blanchard <hollisb@xxxxxxxxxx>
  */
@@ -38,11 +38,15 @@ struct vcpu;
 struct vcpu;
 struct cpu_user_regs;
 extern void show_registers(struct cpu_user_regs *);
+extern void show_execution_state(struct cpu_user_regs *);
 extern void cpu_initialize(void);
 extern void cpu_init_vcpu(struct vcpu *);
 extern void save_cpu_sprs(struct vcpu *);
 extern void load_cpu_sprs(struct vcpu *);
 
+/* XXX this could also land us in GDB */
+#define dump_execution_state() trap()
+
 #define ARCH_HAS_PREFETCH
 static inline void prefetch(const void *x) {;}
 

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