summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilton Miller <miltonm@bga.com>2005-09-06 03:54:13 +0200
committerPaul Mackerras <paulus@samba.org>2005-09-06 08:07:35 +0200
commit41be31b7d61c661a63bb1d5c8be3c39f124beabd (patch)
treed3c9232bde8ac7aa83e20a36265847cf4b9716a3
parent[PATCH] ppc64: Add missing include (diff)
downloadlinux-41be31b7d61c661a63bb1d5c8be3c39f124beabd.tar.xz
linux-41be31b7d61c661a63bb1d5c8be3c39f124beabd.zip
[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>
-rw-r--r--arch/ppc64/xmon/start.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c
index f86b584acd76..93bf8cb0a762 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;