From: Milton Miller <miltonm@bga.com>
Date: Tue, 6 Sep 2005 01:54:13 +0000 (+1000)
Subject: [PATCH] ppc64: dont bypass ppc_md.udbg* functions
X-Git-Tag: v2.6.14-rc1~747^2~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41be31b7d61c661a63bb1d5c8be3c39f124beabd;p=linux-2.6

[PATCH] ppc64: dont bypass ppc_md.udbg* functions

udbg_getc_poll is a ppc_md function.   don't call directly into udbg.c

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c
index f86b584acd..93bf8cb0a7 100644
--- a/arch/ppc64/xmon/start.c
+++ b/arch/ppc64/xmon/start.c
@@ -61,7 +61,9 @@ xmon_read(void *handle, void *ptr, int nb)
 int
 xmon_read_poll(void)
 {
-	return udbg_getc_poll();
+	if (ppc_md.udbg_getc_poll)
+		return ppc_md.udbg_getc_poll();
+	return -1;
 }
  
 FILE *xmon_stdin;