[PATCH] ppc64: Take udbg out of ppc_md

[linux-2.6.git] / arch / ppc64 / xmon / start.c

diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c
index a9265bcc79b24d1e3750efdb3ec86e7ee3d1cd61..e50c158191e169fb4a08c23ef04caa842089c91c 100644 (file)
--- a/arch/ppc64/xmon/start.c
+++ b/arch/ppc64/xmon/start.c
@@ -27,7 +27,7 @@ static void sysrq_handle_xmon(int key, struct pt_regs *pt_regs,
                              struct tty_struct *tty) 
 {
        /* ensure xmon is enabled */
-       xmon_init();
+       xmon_init(1);
        debugger(pt_regs);
 }
 
@@ -61,7 +61,9 @@ xmon_read(void *handle, void *ptr, int nb)
 int
 xmon_read_poll(void)
 {
-       return udbg_getc_poll();
+       if (udbg_getc_poll)
+               return udbg_getc_poll();
+       return -1;
 }
  
 FILE *xmon_stdin;