# HG changeset patch
# User Jimi Xenidis <[EMAIL PROTECTED]>
# Node ID 67953e195eb74f79ab2fd70315e585a7f8941161
# Parent  0ffa1bc4468d7755b2bb6e9cc5bae9e66a2572ab
[POWERPC][XEN] cleanup trap() and other silent panics

Remove some dead code while I'm at it

Signed-off-by: Jimi Xenidis <[EMAIL PROTECTED]>
---
 xen/arch/powerpc/0opt.c             |    4 ++--
 xen/arch/powerpc/hcalls.c           |    3 +--
 xen/include/asm-powerpc/flushtlb.h  |    3 ---
 xen/include/asm-powerpc/mm.h        |    2 --
 xen/include/asm-powerpc/processor.h |    2 +-
 xen/include/asm-powerpc/shadow.h    |   11 -----------
 xen/include/asm-powerpc/system.h    |    4 ++--
 7 files changed, 6 insertions(+), 23 deletions(-)

diff -r 0ffa1bc4468d -r 67953e195eb7 xen/arch/powerpc/0opt.c
--- a/xen/arch/powerpc/0opt.c   Wed Aug 30 09:08:46 2006 -0400
+++ b/xen/arch/powerpc/0opt.c   Wed Aug 30 15:09:47 2006 -0400
@@ -19,10 +19,10 @@
  */
 
 #include <xen/config.h>
-#include <asm/misc.h>
+#include <xen/lib.h>
 
 extern void __cmpxchg_called_with_bad_pointer(void);
 void __cmpxchg_called_with_bad_pointer(void)
 {
-    trap();
+    BUG();
 }
diff -r 0ffa1bc4468d -r 67953e195eb7 xen/arch/powerpc/hcalls.c
--- a/xen/arch/powerpc/hcalls.c Wed Aug 30 09:08:46 2006 -0400
+++ b/xen/arch/powerpc/hcalls.c Wed Aug 30 15:09:47 2006 -0400
@@ -112,9 +112,8 @@ static void do_ni_papr_hypercall(struct 
 {
     struct vcpu *v = get_current();
 
-    printk("unsupported hcall 0x%lx was called by dom0x%x\n",
+    printk("unsupported PAPR hcall 0x%lx was called by dom0x%x\n",
             regs->gprs[3], v->domain->domain_id);
-    debugger_trap_immediate();
 
     regs->gprs[3] = H_Parameter;
 }
diff -r 0ffa1bc4468d -r 67953e195eb7 xen/include/asm-powerpc/flushtlb.h
--- a/xen/include/asm-powerpc/flushtlb.h        Wed Aug 30 09:08:46 2006 -0400
+++ b/xen/include/asm-powerpc/flushtlb.h        Wed Aug 30 15:09:47 2006 -0400
@@ -35,9 +35,6 @@ DECLARE_PER_CPU(u32, tlbflush_time);
 
 static inline int NEED_FLUSH(u32 cpu_stamp, u32 lastuse_stamp)
 {
-#if 0
-    trap();
-#endif
     return 0;
 }
 
diff -r 0ffa1bc4468d -r 67953e195eb7 xen/include/asm-powerpc/mm.h
--- a/xen/include/asm-powerpc/mm.h      Wed Aug 30 09:08:46 2006 -0400
+++ b/xen/include/asm-powerpc/mm.h      Wed Aug 30 15:09:47 2006 -0400
@@ -212,8 +212,6 @@ static inline int page_is_removable(stru
     return ((page->count_info & PGC_count_mask) == 1);
 }
 
-#define set_machinetophys(_mfn, _pfn) (trap(), 0)
-
 extern void synchronise_pagetables(unsigned long cpu_mask);
 
 /* XXX don't know what this is for */
diff -r 0ffa1bc4468d -r 67953e195eb7 xen/include/asm-powerpc/processor.h
--- a/xen/include/asm-powerpc/processor.h       Wed Aug 30 09:08:46 2006 -0400
+++ b/xen/include/asm-powerpc/processor.h       Wed Aug 30 15:09:47 2006 -0400
@@ -50,7 +50,7 @@ extern void load_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 dump_execution_state() BUG()
 
 #define ARCH_HAS_PREFETCH
 static inline void prefetch(const void *x) {;}
diff -r 0ffa1bc4468d -r 67953e195eb7 xen/include/asm-powerpc/shadow.h
--- a/xen/include/asm-powerpc/shadow.h  Wed Aug 30 09:08:46 2006 -0400
+++ b/xen/include/asm-powerpc/shadow.h  Wed Aug 30 15:09:47 2006 -0400
@@ -26,22 +26,11 @@
 #define shadow_mode_translate(_d) (1)
 #define shadow_mode_refcounts(_d) (1)
 
-#define __translate_gpfn_to_mfn(_d, gpfn)              \
-    ( (shadow_mode_translate(_d))                      \
-      ? translate_gpfn_to_mfn(_d, gpfn)                \
-      : (gpfn) )
-
 #define __mfn_to_gpfn(_d, mfn)                         \
     ( (shadow_mode_translate(_d))                      \
       ? machine_to_phys_mapping[(mfn)]                 \
       : (mfn) )
 
-static inline unsigned long
-translate_gpfn_to_mfn(struct domain *rd, unsigned long gpfn)
-{
-    trap();
-    return 0;
-}
 extern void guest_physmap_add_page(
     struct domain *d, unsigned long gpfn, unsigned long mfn);
 
diff -r 0ffa1bc4468d -r 67953e195eb7 xen/include/asm-powerpc/system.h
--- a/xen/include/asm-powerpc/system.h  Wed Aug 30 09:08:46 2006 -0400
+++ b/xen/include/asm-powerpc/system.h  Wed Aug 30 15:09:47 2006 -0400
@@ -22,10 +22,10 @@
 #define _ASM_SYSTEM_H_
 
 #include <xen/config.h>
+#include <xen/lib.h>
 #include <asm/memory.h>
 #include <asm/time.h>
 #include <asm/processor.h>
-#include <asm/misc.h>
 #include <asm/msr.h>
 
 #define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned 
long)(v),(ptr),sizeof(*(ptr))))
@@ -139,7 +139,7 @@ __cmpxchg(volatile void *ptr, unsigned l
 {
     switch (size) {
     case 2:
-        trap(); return 0; /* XXX implement __cmpxchg_u16 ? */
+        BUG(); return 0; /* XXX implement __cmpxchg_u16 ? */
     case 4:
         return __cmpxchg_u32(ptr, old, new);
     case 8:

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

Reply via email to