X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc64%2Fxmon%2Fxmon.c;h=6ef0b1ec3bc7d3ae146af449501cd57beec04895;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=d84ac32fa3b8cf93526767eed382dd1387857ec7;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c
index d84ac32fa..6ef0b1ec3 100644
--- a/arch/ppc64/xmon/xmon.c
+++ b/arch/ppc64/xmon/xmon.c
@@ -252,30 +252,28 @@ extern inline void sync(void)
 
 static inline void disable_surveillance(void)
 {
-#ifndef CONFIG_PPC_ISERIES
+#ifdef CONFIG_PPC_PSERIES
 	/* Since this can't be a module, args should end up below 4GB. */
 	static struct rtas_args args;
 
-	if (systemcfg->platform & PLATFORM_PSERIES) {
-		/*
-		 * At this point we have got all the cpus we can into
-		 * xmon, so there is hopefully no other cpu calling RTAS
-		 * at the moment, even though we don't take rtas.lock.
-		 * If we did try to take rtas.lock there would be a
-		 * real possibility of deadlock.
-		 */
-		args.token = rtas_token("set-indicator");
-		if (args.token == RTAS_UNKNOWN_SERVICE)
-			return;
-		args.nargs = 3;
-		args.nret = 1;
-		args.rets = &args.args[3];
-		args.args[0] = SURVEILLANCE_TOKEN;
-		args.args[1] = 0;
-		args.args[2] = 0;
-		enter_rtas(__pa(&args));
-	}
-#endif
+	/*
+	 * At this point we have got all the cpus we can into
+	 * xmon, so there is hopefully no other cpu calling RTAS
+	 * at the moment, even though we don't take rtas.lock.
+	 * If we did try to take rtas.lock there would be a
+	 * real possibility of deadlock.
+	 */
+	args.token = rtas_token("set-indicator");
+	if (args.token == RTAS_UNKNOWN_SERVICE)
+		return;
+	args.nargs = 3;
+	args.nret = 1;
+	args.rets = &args.args[3];
+	args.args[0] = SURVEILLANCE_TOKEN;
+	args.args[1] = 0;
+	args.args[2] = 0;
+	enter_rtas(__pa(&args));
+#endif /* CONFIG_PPC_PSERIES */
 }
 
 #ifdef CONFIG_SMP
@@ -2059,7 +2057,7 @@ ppc_inst_dump(unsigned long adr, long count, int praddr)
 {
 	int nr, dotted;
 	unsigned long first_adr;
-	unsigned long inst, last_inst;
+	unsigned long inst, last_inst = 0;
 	unsigned char val[4];
 
 	dotted = 0;