diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger_arm.c b/drivers/staging/android/fiq_debugger/fiq_debugger_arm.c
index aaf6e9ba6992..4010ed5e3de3 100644
--- a/drivers/staging/android/fiq_debugger/fiq_debugger_arm.c
+++ b/drivers/staging/android/fiq_debugger/fiq_debugger_arm.c
@@ -189,7 +189,7 @@ static int report_trace(struct stackframe *frame, void *d)
 
 	if (sts->depth) {
 		sts->output->printf(sts->output,
-			"  pc: %p (%pF), lr %p (%pF), sp %p, fp %p\n",
+			"  pc: %px (%pF), lr %px (%pF), sp %px, fp %px\n",
 			frame->pc, frame->pc, frame->lr, frame->lr,
 			frame->sp, frame->fp);
 		sts->depth--;
@@ -213,17 +213,17 @@ static struct frame_tail *user_backtrace(struct fiq_debugger_output *output,
 
 	/* Also check accessibility of one struct frame_tail beyond */
 	if (!access_ok(VERIFY_READ, tail, sizeof(buftail))) {
-		output->printf(output, "  invalid frame pointer %p\n",
+		output->printf(output, "  invalid frame pointer %px\n",
 				tail);
 		return NULL;
 	}
 	if (__copy_from_user_inatomic(buftail, tail, sizeof(buftail))) {
 		output->printf(output,
-			"  failed to copy frame pointer %p\n", tail);
+			"  failed to copy frame pointer %px\n", tail);
 		return NULL;
 	}
 
-	output->printf(output, "  %p\n", buftail[0].lr);
+	output->printf(output, "  %px\n", buftail[0].lr);
 
 	/* frame pointers should strictly progress back up the stack
 	 * (towards higher addresses) */
@@ -258,7 +258,7 @@ void fiq_debugger_dump_stacktrace(struct fiq_debugger_output *output,
 		frame.lr = regs->ARM_lr;
 		frame.pc = regs->ARM_pc;
 		output->printf(output,
-			"  pc: %p (%pF), lr %p (%pF), sp %p, fp %p\n",
+			"  pc: %px (%pF), lr %px (%pF), sp %px, fp %px\n",
 			regs->ARM_pc, regs->ARM_pc, regs->ARM_lr, regs->ARM_lr,
 			regs->ARM_sp, regs->ARM_fp);
 		walk_stackframe(&frame, report_trace, &sts);