From 91b47fddbb1bf295c212df7fa00e58db79167ef8 Mon Sep 17 00:00:00 2001
From: gmcgarry <gmcgarry@NetBSD.org>
Date: Fri, 9 Aug 2002 05:10:45 +0000
Subject: [PATCH] Garbage-collect cpu_sysctl().  From Shin'ichiro TAYA in
 PR-17888.

---
 sys/arch/cobalt/cobalt/machdep.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/sys/arch/cobalt/cobalt/machdep.c b/sys/arch/cobalt/cobalt/machdep.c
index 26a79a0d8d15..ed88aacae591 100644
--- a/sys/arch/cobalt/cobalt/machdep.c
+++ b/sys/arch/cobalt/cobalt/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.37 2002/01/13 23:02:33 augustss Exp $	*/
+/*	$NetBSD: machdep.c,v 1.38 2002/08/09 05:10:45 gmcgarry Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -77,9 +77,7 @@
 #endif
 
 /* For sysctl. */
-char machine[] = MACHINE;
-char machine_arch[] = MACHINE_ARCH;
-char cpu_model[] = "Cobalt Microserver";
+extern char cpu_model[];
 
 /* Our exported CPU info; we can have only one. */  
 struct cpu_info cpu_info_store;
@@ -185,6 +183,8 @@ mach_init(memsize)
                 kgdb_connect(0);
 #endif    
 
+	strcpy(cpu_model, "Cobalt Microserver");
+
 	/*
 	 * Load the rest of the available pages into the VM system.
 	 */
@@ -315,26 +315,6 @@ cpu_startup()
 	bufinit();
 }
 
-int
-cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
-	int *name;
-	u_int namelen;
-	void *oldp;
-	size_t *oldlenp;
-	void *newp;
-	size_t newlen;
-	struct proc *p;
-{
-	/* All sysctl names at this level are terminal. */
-	if (namelen != 1)
-		return ENOTDIR;
-
-	switch (name[0]) {
-	default:
-		return EOPNOTSUPP;
-	}
-}
-
 int	waittime = -1;
 
 void