7 files changed, 21 insertions, 16 deletions

diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 9c2a5be7a56a..23c85af53d47 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -276,7 +276,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
 
  finish:
         of_dump_addr("OF: parent translation for:", addr, pna);
-        DBG("OF: with offset: %lx\n", offset);
+        DBG("OF: with offset: "PRu64"\n", offset);
 
         /* Translate it into parent bus space */
         return pbus->translate(addr, offset, pna);
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index cc2df5e61bb0..a058285a70e7 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -17,7 +17,7 @@
 #include <asm/processor.h>
 
 void (*udbg_putc)(char c);
-char (*udbg_getc)(void);
+int (*udbg_getc)(void);
 int (*udbg_getc_poll)(void);
 
 /* udbg library, used by xmon et al */
@@ -57,8 +57,8 @@ int udbg_write(const char *s, int n)
 
 int udbg_read(char *buf, int buflen)
 {
-        char c, *p = buf;
-        int i;
+        char *p = buf;
+        int i, c;
 
         if (!udbg_getc)
                 return 0;
@@ -66,8 +66,11 @@ int udbg_read(char *buf, int buflen)
         for (i = 0; i < buflen; ++i) {
                 do {
                         c = udbg_getc();
+                        if (c == -1 && i == 0)
+                                return -1;
+
                 } while (c == 0x11 || c == 0x13);
-                if (c == 0)
+                if (c == 0 || c == -1)
                         break;
                 *p++ = c;
         }
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index 28a58da5592c..e58c048a7b19 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -69,14 +69,14 @@ static int udbg_550_getc_poll(void)
         return -1;
 }
 
-static char udbg_550_getc(void)
+static int udbg_550_getc(void)
 {
         if (udbg_comport) {
                 while ((in_8(&udbg_comport->lsr) & LSR_DR) == 0)
                         /* wait for char */;
                 return in_8(&udbg_comport->rbr);
         }
-        return 0;
+        return -1;
 }
 
 void udbg_init_uart(void __iomem *comport, unsigned int speed,
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c
index 3d5ed23bf0e0..06c8265c2baf 100644
--- a/arch/powerpc/platforms/powermac/udbg_adb.c
+++ b/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -29,7 +29,7 @@
  */
 
 static void (*udbg_adb_old_putc)(char c);
-static char (*udbg_adb_old_getc)(void);
+static int (*udbg_adb_old_getc)(void);
 static int (*udbg_adb_old_getc_poll)(void);
 
 static enum {
@@ -73,7 +73,7 @@ static unsigned char xmon_shift_keytab[128] =
         "\0.\0*\0+\0\0\0\0\0/\r\0-\0"                   /* 0x40 - 0x4f */
         "\0\0000123456789\0\0\0";                       /* 0x50 - 0x5f */
 
-static char udbg_adb_local_getc(void)
+static int udbg_adb_local_getc(void)
 {
         int k, t, on;
 
@@ -116,7 +116,7 @@ static char udbg_adb_local_getc(void)
 }
 #endif /* CONFIG_BOOTX_TEXT */
 
-static char udbg_adb_getc(void)
+static int udbg_adb_getc(void)
 {
 #ifdef CONFIG_BOOTX_TEXT
         if (udbg_adb_use_btext && input_type != input_adb_none)
@@ -195,7 +195,7 @@ int udbg_adb_init(int force_btext)
          */
         for (np = NULL; (np = of_find_node_by_name(np, "keyboard")) != NULL;) {
                 struct device_node *parent = of_get_parent(np);
-                int found = (parent && !strcmp(parent->type, "adb") == 0);
+                int found = (parent && strcmp(parent->type, "adb") == 0);
                 of_node_put(parent);
                 if (found)
                         break;
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c
index df6dec49c4c7..e87d53acfb61 100644
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -47,14 +47,14 @@ static int udbg_scc_getc_poll(void)
         return -1;
 }
 
-static char udbg_scc_getc(void)
+static int udbg_scc_getc(void)
 {
         if (sccc) {
                 while ((in_8(sccc) & SCC_RXRDY) == 0)
                         ;
                 return in_8(sccd);
         }
-        return 0;
+        return -1;
 }
 
 static unsigned char scc_inittab[] = {
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 615ffb961059..1fe445ab78a6 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -112,7 +112,7 @@ static int udbg_hvsi_getc_poll(void)
         return ch;
 }
 
-static char udbg_hvsi_getc(void)
+static int udbg_hvsi_getc(void)
 {
         int ch;
         for (;;) {
@@ -173,7 +173,7 @@ static int udbg_getc_pollLP(void)
         return ch;
 }
 
-static char udbg_getcLP(void)
+static int udbg_getcLP(void)
 {
         int ch;
         for (;;) {
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index c45a6ad5f3b7..465b75c5647e 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -450,7 +450,6 @@ int xmon_core(struct pt_regs *regs, int fromipi)
  leave:
         cpu_clear(cpu, cpus_in_xmon);
         xmon_fault_jmp[cpu] = NULL;
-
 #else
         /* UP is simple... */
         if (in_xmon) {
@@ -805,7 +804,10 @@ cmds(struct pt_regs *excp)
                         break;
                 case 'x':
                 case 'X':
+                        return cmd;
                 case EOF:
+                        printf(" <no input ...>\n");
+                        mdelay(2000);
                         return cmd;
                 case '?':
                         printf(help_string);