Make octeon kernels compile with DEBUG.

Based on a diff from jj@. Thank you!

6 files changed, 12 insertions, 15 deletions

diff --git a/sys/arch/mips64/mips64/db_machdep.c b/sys/arch/mips64/mips64/db_machdep.c
index 91f479b99b7..e3bcc5a10c9 100644
--- a/sys/arch/mips64/mips64/db_machdep.c
+++ b/sys/arch/mips64/mips64/db_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.c,v 1.49 2018/03/20 15:45:32 mpi Exp $ */
+/*	$OpenBSD: db_machdep.c,v 1.50 2018/06/13 14:38:42 visa Exp $ */
 
 /*
  * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -185,7 +185,7 @@ db_enter_ddb(void)
 	mtx_enter(&ddb_mp_mutex);
 
 #ifdef DEBUG
-	printf("db_enter_ddb %d: state %x pause %x\n", ci->ci_cpuid,
+	printf("db_enter_ddb %lu: state %x pause %x\n", ci->ci_cpuid,
 	    ddb_state, ci->ci_ddb);
 #endif
 	/* If we are first in, grab ddb and stop all other CPUs */
diff --git a/sys/arch/mips64/mips64/ipifuncs.c b/sys/arch/mips64/mips64/ipifuncs.c
index 5e1a6c8d094..04028e67291 100644
--- a/sys/arch/mips64/mips64/ipifuncs.c
+++ b/sys/arch/mips64/mips64/ipifuncs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipifuncs.c,v 1.18 2018/02/18 14:42:32 visa Exp $ */
+/* $OpenBSD: ipifuncs.c,v 1.19 2018/06/13 14:38:42 visa Exp $ */
 /* $NetBSD: ipifuncs.c,v 1.40 2008/04/28 20:23:10 martin Exp $ */
 
 /*-
@@ -131,7 +131,7 @@ mips64_send_ipi(unsigned int cpuid, unsigned int ipimask)
 	if (cpuid >= CPU_MAXID || get_cpu_info(cpuid) == NULL)
 		panic("mips_send_ipi: bogus cpu_id");
 	if (!cpuset_isset(&cpus_running, get_cpu_info(cpuid)))
-	        panic("mips_send_ipi: CPU %ld not running", cpuid);
+	        panic("mips_send_ipi: CPU %u not running", cpuid);
 #endif
 
 	atomic_setbits_int(&ipi_mailbox[cpuid], ipimask);
@@ -162,7 +162,7 @@ void
 mips64_ipi_nop(void)
 {
 #ifdef DEBUG
-	printf("mips64_ipi_nop on cpu%d\n", cpu_number());
+	printf("mips64_ipi_nop on cpu%lu\n", cpu_number());
 #endif
 }
 
diff --git a/sys/arch/mips64/mips64/mips64_machdep.c b/sys/arch/mips64/mips64/mips64_machdep.c
index 3febe4ea9b1..97d0325ef5d 100644
--- a/sys/arch/mips64/mips64/mips64_machdep.c
+++ b/sys/arch/mips64/mips64/mips64_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mips64_machdep.c,v 1.25 2017/09/02 15:56:29 visa Exp $ */
+/*	$OpenBSD: mips64_machdep.c,v 1.26 2018/06/13 14:38:42 visa Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2012 Miodrag Vallat.
@@ -186,7 +186,7 @@ exec_md_map(struct proc *p, struct exec_package *pack)
 	if (rc != 0)
 		return rc;
 #ifdef DEBUG
-	printf("%s: p %p fppgva %p\n", __func__, p, va);
+	printf("%s: p %p fppgva %p\n", __func__, p, (void *)va);
 #endif
 	p->p_md.md_fppgva = va;
 #endif
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index 0fbb0efa573..b9d29fb5784 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.132 2018/05/09 03:23:20 visa Exp $	*/
+/*	$OpenBSD: trap.c,v 1.133 2018/06/13 14:38:42 visa Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1608,7 +1608,7 @@ fn_name(vaddr_t addr)
 	for (i = 0; names[i].name != NULL; i++)
 		if (names[i].addr == (void*)addr)
 			return (names[i].name);
-	snprintf(buf, sizeof(buf), "%p", addr);
+	snprintf(buf, sizeof(buf), "%p", (void *)addr);
 	return (buf);
 }
 #endif	/* !DDB */
diff --git a/sys/arch/octeon/dev/octeon_pcibus.c b/sys/arch/octeon/dev/octeon_pcibus.c
index 8dfa938b72b..4f61899628b 100644
--- a/sys/arch/octeon/dev/octeon_pcibus.c
+++ b/sys/arch/octeon/dev/octeon_pcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_pcibus.c,v 1.19 2016/10/21 12:36:19 pirofti Exp $	*/
+/*	$OpenBSD: octeon_pcibus.c,v 1.20 2018/06/13 14:38:42 visa Exp $	*/
 /*	$NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $	*/
 /*	$NetBSD: bonito_pci.c,v 1.5 2008/04/28 20:23:28 martin Exp $	*/
 
@@ -489,7 +489,7 @@ octeon_pcibus_get_resource_extent(pci_chipset_tag_t pc, int io)
 			goto error;
 	}
 
-#ifdef DEBUG
+#if defined(DEBUG) && defined(DIAGNOSTIC)
 	extent_print(ex);
 #endif
 	return ex;
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 019a23a6378..726c8374170 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.105 2018/04/09 13:46:15 visa Exp $ */
+/*	$OpenBSD: machdep.c,v 1.106 2018/06/13 14:38:42 visa Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -419,8 +419,6 @@ mips_init(register_t a0, register_t a1, register_t a2, register_t a3)
 	consinit();
 	printf("Initial setup done, switching console.\n");
 
-#define DEBUG
-#ifdef DEBUG
 #define DUMP_BOOT_DESC(field, format) \
 	printf("boot_desc->" #field ":" #format "\n", boot_desc->field)
 #define DUMP_BOOT_INFO(field, format) \
@@ -466,7 +464,6 @@ mips_init(register_t a0, register_t a1, register_t a2, register_t a3)
 	DUMP_BOOT_INFO(config_flags, %#x);
 	if (octeon_boot_info->ver_minor >= 3)
 		DUMP_BOOT_INFO(fdt_addr, %#llx);
-#endif
 
 	/*
 	 * It is possible to launch the kernel from the bootloader without