Get rid of machdep.debug, machdep.booted_device and machdep.booted_kernel

sysctl. Only the first one is really implemented, and it only matters on
older processor flavours we don't run on (and don't want to), so this was
just dead weight.

8 files changed, 14 insertions, 49 deletions

diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index 6b436f2f6c9..4384132dec3 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arm32_machdep.c,v 1.35 2010/06/27 13:28:46 miod Exp $	*/
+/*	$OpenBSD: arm32_machdep.c,v 1.36 2010/11/28 20:44:15 miod Exp $	*/
 /*	$NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $	*/
 
 /*
@@ -102,13 +102,8 @@ struct cpu_info cpu_info_store;
 caddr_t	msgbufaddr;
 extern paddr_t msgbufphys;
 
-int kernel_debug = 0;
-
 struct user *proc0paddr;
 
-/* exported variable to be filled in by the bootloaders */
-char *booted_kernel;
-
 #ifdef APERTURE
 #ifdef INSECURE
 int allowaperture = 1;
@@ -346,9 +341,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 		return (ENOTDIR);		/* overloaded */
 
 	switch (name[0]) {
-	case CPU_DEBUG:
-		return(sysctl_int(oldp, oldlenp, newp, newlen, &kernel_debug));
-
 	case CPU_CONSDEV: {
 		dev_t consdev;
 		if (cn_tab != NULL)
@@ -358,12 +350,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 		return (sysctl_rdstruct(oldp, oldlenp, newp, &consdev,
 			sizeof consdev));
 	}
-	case CPU_BOOTED_KERNEL: {
-		if (booted_kernel != NULL && booted_kernel[0] != '\0')
-			return sysctl_rdstring(oldp, oldlenp, newp,
-			    booted_kernel);
-		return (EOPNOTSUPP);
-	}
 
 	case CPU_ALLOWAPERTURE:
 #ifdef APERTURE
diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index f3e97cd71e4..689e1bdf64f 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.27 2010/11/27 20:45:26 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.28 2010/11/28 20:44:15 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -2894,20 +2894,6 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va, vm_prot_t ftype, int user)
 	    curcpu()->ci_arm_cpurev < 3) {
 		/* Always current pmap */
 		if (l2pte_valid(pte)) {
-			extern int kernel_debug;
-			if (kernel_debug & 1) {
-				struct proc *p = curproc;
-				printf("prefetch_abort: page is already "
-				    "mapped - pte=%p *pte=%08x\n", ptep, pte);
-				printf("prefetch_abort: pc=%08lx proc=%p "
-				    "process=%s\n", va, p, p->p_comm);
-				printf("prefetch_abort: far=%08x fs=%x\n",
-				    cpu_faultaddress(), cpu_faultstatus());
-			}
-#ifdef DDB
-			if (kernel_debug & 2)
-				Debugger();
-#endif
 			rv = 1;
 		}
 	}
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 145718deec1..407d972b233 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.25 2010/09/28 20:27:54 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.26 2010/11/28 20:44:20 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $	*/
 
 /*
@@ -54,9 +54,9 @@
  */
 
 /*  CTL_MACHDEP definitions. */
-#define	CPU_DEBUG		1	/* int: misc kernel debug control */
-#define	CPU_BOOTED_DEVICE	2	/* string: device we booted from */
-#define	CPU_BOOTED_KERNEL	3	/* string: kernel we booted */
+		/*		1	   formerly int: CPU_DEBUG */
+		/*		2	   formerly string: CPU_BOOTED_DEVICE */
+		/*		3	   formerly string: CPU_BOOTED_KERNEL */
 #define	CPU_CONSDEV		4	/* struct: dev_t of our console */
 #define	CPU_POWERSAVE		5	/* int: use CPU powersave mode */
 #define	CPU_ALLOWAPERTURE	6	/* int: allow mmap of /dev/xf86 */
@@ -70,9 +70,9 @@
 
 #define	CTL_MACHDEP_NAMES { \
 	{ 0, 0 }, \
-	{ "debug", CTLTYPE_INT }, \
-	{ "booted_device", CTLTYPE_STRING }, \
-	{ "booted_kernel", CTLTYPE_STRING }, \
+	{ 0, 0 }, \
+	{ 0, 0 }, \
+	{ 0, 0 }, \
 	{ "console_device", CTLTYPE_STRUCT }, \
 	{ "powersave", CTLTYPE_INT }, \
 	{ "allowaperture", CTLTYPE_INT }, \
diff --git a/sys/arch/armish/armish/autoconf.c b/sys/arch/armish/armish/autoconf.c
index 780622bc4b4..5072d36f41a 100644
--- a/sys/arch/armish/armish/autoconf.c
+++ b/sys/arch/armish/armish/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.10 2008/07/21 04:35:54 todd Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.11 2010/11/28 20:44:20 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -56,8 +56,6 @@
 #include <machine/intr.h>
 #include <dev/cons.h>
 
-struct device *booted_device;
-int booted_partition;
 struct device *bootdv = NULL;
 extern char *boot_file;
 
diff --git a/sys/arch/beagle/beagle/autoconf.c b/sys/arch/beagle/beagle/autoconf.c
index 47f6f688050..bd82d8af3d5 100644
--- a/sys/arch/beagle/beagle/autoconf.c
+++ b/sys/arch/beagle/beagle/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.1 2009/05/08 03:13:26 drahn Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.2 2010/11/28 20:44:20 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -52,8 +52,6 @@
 #include <machine/bootconfig.h>
 #include <machine/intr.h>
 
-struct device *booted_device;
-int booted_partition;
 struct device *bootdv = NULL;
 extern char *boot_file;
 
diff --git a/sys/arch/gumstix/gumstix/autoconf.c b/sys/arch/gumstix/gumstix/autoconf.c
index 515d0144447..9025518dfd6 100644
--- a/sys/arch/gumstix/gumstix/autoconf.c
+++ b/sys/arch/gumstix/gumstix/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.1 2008/11/26 14:18:11 drahn Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.2 2010/11/28 20:44:20 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -57,7 +57,6 @@
 #include <machine/intr.h>
 #include <dev/cons.h>
 
-int booted_partition;
 struct device *bootdv = NULL;
 extern char *boot_file;
 
diff --git a/sys/arch/palm/palm/autoconf.c b/sys/arch/palm/palm/autoconf.c
index 1bf98a76479..a47cc627c39 100644
--- a/sys/arch/palm/palm/autoconf.c
+++ b/sys/arch/palm/palm/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.1 2009/09/05 01:22:11 marex Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.2 2010/11/28 20:44:20 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -57,7 +57,6 @@
 #include <machine/intr.h>
 #include <dev/cons.h>
 
-int booted_partition;
 struct device *bootdv = NULL;
 extern char *boot_file;
 
diff --git a/sys/arch/zaurus/zaurus/autoconf.c b/sys/arch/zaurus/zaurus/autoconf.c
index e99f8ff0167..9c96ef1e4f4 100644
--- a/sys/arch/zaurus/zaurus/autoconf.c
+++ b/sys/arch/zaurus/zaurus/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.13 2008/07/21 04:35:54 todd Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.14 2010/11/28 20:44:20 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -57,7 +57,6 @@
 #include <machine/intr.h>
 #include <dev/cons.h>
 
-int booted_partition;
 struct device *bootdv = NULL;
 extern char *boot_file;