From 7f8eec1143eae525801317753353db37e192b99c Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sun, 13 Jul 2014 14:16:09 +0000
Subject: [PATCH] print leading '0x' for addresses and masks with
 DUMP_BOOT_{DESC,INFO}

ok pirofti@
---
 sys/arch/octeon/octeon/machdep.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index bd6e73e5aae..e6df5a11363 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.55 2014/07/13 13:19:01 jasper Exp $ */
+/*	$OpenBSD: machdep.c,v 1.56 2014/07/13 14:16:09 jasper Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -407,38 +407,38 @@ mips_init(__register_t a0, __register_t a1, __register_t a2 __unused,
 	DUMP_BOOT_DESC(heap_start, %llx);
 	DUMP_BOOT_DESC(heap_end, %llx);
 	DUMP_BOOT_DESC(argc, %d);
-	DUMP_BOOT_DESC(flags, %x);
-	DUMP_BOOT_DESC(core_mask, %x);
+	DUMP_BOOT_DESC(flags, %#x);
+	DUMP_BOOT_DESC(core_mask, %#x);
 	DUMP_BOOT_DESC(dram_size, %d);
-	DUMP_BOOT_DESC(phy_mem_desc_addr, %x);
-	DUMP_BOOT_DESC(debugger_flag_addr, %x);
+	DUMP_BOOT_DESC(phy_mem_desc_addr, %#x);
+	DUMP_BOOT_DESC(debugger_flag_addr, %#x);
 	DUMP_BOOT_DESC(eclock, %d);
-	DUMP_BOOT_DESC(boot_info_addr, %llx);
+	DUMP_BOOT_DESC(boot_info_addr, %#llx);
 
 	DUMP_BOOT_INFO(ver_major, %d);
 	DUMP_BOOT_INFO(ver_minor, %d);
 	DUMP_BOOT_INFO(stack_top, %llx);
 	DUMP_BOOT_INFO(heap_start, %llx);
 	DUMP_BOOT_INFO(heap_end, %llx);
-	DUMP_BOOT_INFO(boot_desc_addr, %llx);
-	DUMP_BOOT_INFO(exception_base_addr, %x);
+	DUMP_BOOT_INFO(boot_desc_addr, %#llx);
+	DUMP_BOOT_INFO(exception_base_addr, %#x);
 	DUMP_BOOT_INFO(stack_size, %d);
-	DUMP_BOOT_INFO(flags, %x);
-	DUMP_BOOT_INFO(core_mask, %x);
+	DUMP_BOOT_INFO(flags, %#x);
+	DUMP_BOOT_INFO(core_mask, %#x);
 	DUMP_BOOT_INFO(dram_size, %d);
-	DUMP_BOOT_INFO(phys_mem_desc_addr, %x);
-	DUMP_BOOT_INFO(debugger_flags_addr, %x);
+	DUMP_BOOT_INFO(phys_mem_desc_addr, %#x);
+	DUMP_BOOT_INFO(debugger_flags_addr, %#x);
 	DUMP_BOOT_INFO(eclock, %d);
 	DUMP_BOOT_INFO(dclock, %d);
 	DUMP_BOOT_INFO(board_type, %d);
 	DUMP_BOOT_INFO(board_rev_major, %d);
 	DUMP_BOOT_INFO(board_rev_minor, %d);
 	DUMP_BOOT_INFO(mac_addr_count, %d);
-	DUMP_BOOT_INFO(cf_common_addr, %llx);
-	DUMP_BOOT_INFO(cf_attr_addr, %llx);
-	DUMP_BOOT_INFO(led_display_addr, %llx);
+	DUMP_BOOT_INFO(cf_common_addr, %#llx);
+	DUMP_BOOT_INFO(cf_attr_addr, %#llx);
+	DUMP_BOOT_INFO(led_display_addr, %#llx);
 	DUMP_BOOT_INFO(dfaclock, %d);
-	DUMP_BOOT_INFO(config_flags, %x);
+	DUMP_BOOT_INFO(config_flags, %#x);
 #endif
 
 	/*
-- 
2.20.1