Make the code to read the kernel message buffer via sysctl machine-

independent and rename the corresponding sysctls from machdep.msgbuf and
machdep.msgbuf_clear (i386 only) to kern.msgbuf and kern.msgbuf_clear.

1 files changed, 0 insertions, 42 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index e5eb21e..73b8052 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -184,48 +184,6 @@ sysctl_hw_availpages(SYSCTL_HANDLER_ARGS)
 SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD,
 	0, 0, sysctl_hw_availpages, "I", "");
 
-static int
-sysctl_machdep_msgbuf(SYSCTL_HANDLER_ARGS)
-{
-	int error;
-
-	/* Unwind the buffer, so that it's linear (possibly starting with
-	 * some initial nulls).
-	 */
-	error=sysctl_handle_opaque(oidp,msgbufp->msg_ptr+msgbufp->msg_bufr,
-		msgbufp->msg_size-msgbufp->msg_bufr,req);
-	if(error) return(error);
-	if(msgbufp->msg_bufr>0) {
-		error=sysctl_handle_opaque(oidp,msgbufp->msg_ptr,
-			msgbufp->msg_bufr,req);
-	}
-	return(error);
-}
-
-SYSCTL_PROC(_machdep, OID_AUTO, msgbuf, CTLTYPE_STRING|CTLFLAG_RD,
-	0, 0, sysctl_machdep_msgbuf, "A","Contents of kernel message buffer");
-
-static int msgbuf_clear;
-
-static int
-sysctl_machdep_msgbuf_clear(SYSCTL_HANDLER_ARGS)
-{
-	int error;
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,
-		req);
-	if (!error && req->newptr) {
-		/* Clear the buffer and reset write pointer */
-		bzero(msgbufp->msg_ptr,msgbufp->msg_size);
-		msgbufp->msg_bufr=msgbufp->msg_bufx=0;
-		msgbuf_clear=0;
-	}
-	return (error);
-}
-
-SYSCTL_PROC(_machdep, OID_AUTO, msgbuf_clear, CTLTYPE_INT|CTLFLAG_RW,
-	&msgbuf_clear, 0, sysctl_machdep_msgbuf_clear, "I",
-	"Clear kernel message buffer");
-
 int Maxmem = 0;
 long dumplo;