1 files changed, 2 insertions, 12 deletions

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 5b150f0c5df9..e66ace703a69 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -25,6 +25,7 @@
 #include <linux/irq.h>
 #include <linux/bug.h>
 #include <linux/nmi.h>
+#include <linux/ctype.h>
 
 #include <asm/ptrace.h>
 #include <asm/string.h>
@@ -183,14 +184,6 @@ extern void xmon_leave(void);
 #define GETWORD(v)      (((v)[0] << 24) + ((v)[1] << 16) + ((v)[2] << 8) + (v)[3])
 #endif
 
-#define isxdigit(c)     (('0' <= (c) && (c) <= '9') \
-                         || ('a' <= (c) && (c) <= 'f') \
-                         || ('A' <= (c) && (c) <= 'F'))
-#define isalnum(c)      (('0' <= (c) && (c) <= '9') \
-                         || ('a' <= (c) && (c) <= 'z') \
-                         || ('A' <= (c) && (c) <= 'Z'))
-#define isspace(c)      (c == ' ' || c == '\t' || c == 10 || c == 13 || c == 0)
-
 static char *help_string = "\
 Commands:\n\
   b     show breakpoints\n\
@@ -2164,9 +2157,6 @@ static void dump_pacas(void)
 }
 #endif
 
-#define isxdigit(c)     (('0' <= (c) && (c) <= '9') \
-                         || ('a' <= (c) && (c) <= 'f') \
-                         || ('A' <= (c) && (c) <= 'F'))
 static void
 dump(void)
 {
@@ -2569,7 +2559,7 @@ scanhex(unsigned long *vp)
                 int i;
                 for (i=0; i<63; i++) {
                         c = inchar();
-                        if (isspace(c)) {
+                        if (isspace(c) || c == '\0') {
                                 termch = c;
                                 break;
                         }