ppc64: fix up some warnings

diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c
index 13457eb1894bfc9997b83a2c90e1a88f05965400..1053142db17cbb5b9b42234868880a17e5dcfaed 100644 (file)
--- a/arch/ppc64/xmon/start.c
+++ b/arch/ppc64/xmon/start.c
@@ -7,12 +7,11 @@
  *      2 of the License, or (at your option) any later version.
  */
 #include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/sysrq.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
 #include <asm/page.h>
-#include <linux/pmu.h>
-#include <linux/kernel.h>
-#include <linux/sysrq.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
 

diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c
index 113ad041e55223adea115418e3fc12cb17c5853e..b3416992ccbf4418d4c5c32f825d71a185e4f4e2 100644 (file)
--- a/arch/ppc64/xmon/xmon.c
+++ b/arch/ppc64/xmon/xmon.c
@@ -12,6 +12,8 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
+#include <linux/mm.h>
+#include <linux/reboot.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
 #include <asm/prom.h>
@@ -22,13 +24,9 @@
 #include <asm/mmu_context.h>
 #include <asm/Naca.h>
 #include <asm/Paca.h>
+#include <asm/ppcdebug.h>
 #include "nonstdio.h"
 #include "privinst.h"
-#include <linux/mm.h>
-
-#include <asm/ppcdebug.h>
-
-#include <asm/Paca.h>
 
 #define scanhex        xmon_scanhex
 #define skipbl xmon_skipbl
@@ -132,7 +130,6 @@ static void mem_map_check_slab(void);
 static void mem_map_lock_pages(void);
 static void mem_map_check_hash(void);
 static void mem_check_dup_rpn (void);
-static void show_state(void);
 static void debug_trace(void);
 
 extern int print_insn_big_powerpc(FILE *, unsigned long, unsigned long);
@@ -1218,7 +1215,7 @@ read_spr(int n)
 
        instrs[0] = 0x7c6002a6 + ((n & 0x1F) << 16) + ((n & 0x3e0) << 6);
        instrs[1] = 0x4e800020;
-       opd[0] = instrs;
+       opd[0] = (unsigned long)instrs;
        opd[1] = 0;
        opd[2] = 0;
        store_inst(instrs);
@@ -1237,7 +1234,7 @@ write_spr(int n, unsigned long val)
 
        instrs[0] = 0x7c6003a6 + ((n & 0x1F) << 16) + ((n & 0x3e0) << 6);
        instrs[1] = 0x4e800020;
-       opd[0] = instrs;
+       opd[0] = (unsigned long)instrs;
        opd[1] = 0;
        opd[2] = 0;
        store_inst(instrs);