1 files changed, 10 insertions, 25 deletions

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index bb4fe4e1a601..d72b32c66f7d 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1192,7 +1192,7 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs,
         if (reason == KDB_REASON_DEBUG) {
                 /* special case below */
         } else {
-                kdb_printf("\nEntering kdb (current=0x%p, pid %d) ",
+                kdb_printf("\nEntering kdb (current=0x%px, pid %d) ",
                            kdb_current, kdb_current ? kdb_current->pid : 0);
 #if defined(CONFIG_SMP)
                 kdb_printf("on processor %d ", raw_smp_processor_id());
@@ -1208,7 +1208,7 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs,
                  */
                 switch (db_result) {
                 case KDB_DB_BPT:
-                        kdb_printf("\nEntering kdb (0x%p, pid %d) ",
+                        kdb_printf("\nEntering kdb (0x%px, pid %d) ",
                                    kdb_current, kdb_current->pid);
 #if defined(CONFIG_SMP)
                         kdb_printf("on processor %d ", raw_smp_processor_id());
@@ -1493,6 +1493,7 @@ static void kdb_md_line(const char *fmtstr, unsigned long addr,
         char cbuf[32];
         char *c = cbuf;
         int i;
+        int j;
         unsigned long word;
 
         memset(cbuf, '\0', sizeof(cbuf));
@@ -1538,25 +1539,9 @@ static void kdb_md_line(const char *fmtstr, unsigned long addr,
                         wc.word = word;
 #define printable_char(c) \
         ({unsigned char __c = c; isascii(__c) && isprint(__c) ? __c : '.'; })
-                        switch (bytesperword) {
-                        case 8:
+                        for (j = 0; j < bytesperword; j++)
                                 *c++ = printable_char(*cp++);
-                                *c++ = printable_char(*cp++);
-                                *c++ = printable_char(*cp++);
-                                *c++ = printable_char(*cp++);
-                                addr += 4;
-                        case 4:
-                                *c++ = printable_char(*cp++);
-                                *c++ = printable_char(*cp++);
-                                addr += 2;
-                        case 2:
-                                *c++ = printable_char(*cp++);
-                                addr++;
-                        case 1:
-                                *c++ = printable_char(*cp++);
-                                addr++;
-                                break;
-                        }
+                        addr += bytesperword;
 #undef printable_char
                 }
         }
@@ -2048,7 +2033,7 @@ static int kdb_lsmod(int argc, const char **argv)
                 if (mod->state == MODULE_STATE_UNFORMED)
                         continue;
 
-                kdb_printf("%-20s%8u  0x%p ", mod->name,
+                kdb_printf("%-20s%8u  0x%px ", mod->name,
                            mod->core_layout.size, (void *)mod);
 #ifdef CONFIG_MODULE_UNLOAD
                 kdb_printf("%4d ", module_refcount(mod));
@@ -2059,7 +2044,7 @@ static int kdb_lsmod(int argc, const char **argv)
                         kdb_printf(" (Loading)");
                 else
                         kdb_printf(" (Live)");
-                kdb_printf(" 0x%p", mod->core_layout.base);
+                kdb_printf(" 0x%px", mod->core_layout.base);
 
 #ifdef CONFIG_MODULE_UNLOAD
                 {
@@ -2341,7 +2326,7 @@ void kdb_ps1(const struct task_struct *p)
                 return;
 
         cpu = kdb_process_cpu(p);
-        kdb_printf("0x%p %8d %8d  %d %4d   %c  0x%p %c%s\n",
+        kdb_printf("0x%px %8d %8d  %d %4d   %c  0x%px %c%s\n",
                    (void *)p, p->pid, p->parent->pid,
                    kdb_task_has_cpu(p), kdb_process_cpu(p),
                    kdb_task_state_char(p),
@@ -2354,7 +2339,7 @@ void kdb_ps1(const struct task_struct *p)
                 } else {
                         if (KDB_TSK(cpu) != p)
                                 kdb_printf("  Error: does not match running "
-                                   "process table (0x%p)\n", KDB_TSK(cpu));
+                                   "process table (0x%px)\n", KDB_TSK(cpu));
                 }
         }
 }
@@ -2687,7 +2672,7 @@ int kdb_register_flags(char *cmd,
         for_each_kdbcmd(kp, i) {
                 if (kp->cmd_name && (strcmp(kp->cmd_name, cmd) == 0)) {
                         kdb_printf("Duplicate kdb command registered: "
-                                "%s, func %p help %s\n", cmd, func, help);
+                                "%s, func %px help %s\n", cmd, func, help);
                         return 1;
                 }
         }