From 41be31b7d61c661a63bb1d5c8be3c39f124beabd Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Tue, 6 Sep 2005 11:54:13 +1000 Subject: [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 Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras --- arch/ppc64/xmon/start.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/ppc64/xmon/start.c') 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; -- cgit v1.2.2 From c8f1c8be629ee34991fdba8bfe46a5c455393209 Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Tue, 6 Sep 2005 11:56:42 +1000 Subject: [PATCH] ppc64: Take udbg out of ppc_md Take udbg out of ppc_md. Allows us to not overwrite early udbg inits when assigning ppc_md. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras --- arch/ppc64/xmon/start.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/ppc64/xmon/start.c') diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c index 93bf8cb0a762..e50c158191e1 100644 --- a/arch/ppc64/xmon/start.c +++ b/arch/ppc64/xmon/start.c @@ -61,8 +61,8 @@ xmon_read(void *handle, void *ptr, int nb) int xmon_read_poll(void) { - if (ppc_md.udbg_getc_poll) - return ppc_md.udbg_getc_poll(); + if (udbg_getc_poll) + return udbg_getc_poll(); return -1; } -- cgit v1.2.2