[src/trunk]: src/sys/arch/i386/i386 move machdep.est.cpu_brand to machdep.cpu...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f3a0dd38c971
branches:  trunk
changeset: 566296:f3a0dd38c971
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon May 03 16:38:28 2004 +0000

description:
move machdep.est.cpu_brand to machdep.cpu_brand

diffstat:

 sys/arch/i386/i386/est.c     |  9 ++-------
 sys/arch/i386/i386/machdep.c |  9 +++++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (60 lines):

diff -r 19a9fa5edd72 -r f3a0dd38c971 sys/arch/i386/i386/est.c
--- a/sys/arch/i386/i386/est.c  Mon May 03 15:57:36 2004 +0000
+++ b/sys/arch/i386/i386/est.c  Mon May 03 16:38:28 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: est.c,v 1.2 2004/04/30 02:05:43 lukem Exp $    */
+/*     $NetBSD: est.c,v 1.3 2004/05/03 16:38:28 lukem Exp $    */
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.2 2004/04/30 02:05:43 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.3 2004/05/03 16:38:28 lukem Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -358,11 +358,6 @@
            NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
                goto err;
 
-       if ((rc = sysctl_createv(NULL, 0, &estnode, &node,
-           0, CTLTYPE_STRING, "cpu_brand", NULL,
-           NULL, 0, &cpu_brand_string, 0, CTL_CREATE, CTL_EOL)) != 0)
-               goto err;
-
        if ((rc = sysctl_createv(NULL, 0, &estnode, &freqnode,
            0, CTLTYPE_NODE, "frequency", NULL,
            NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
diff -r 19a9fa5edd72 -r f3a0dd38c971 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Mon May 03 15:57:36 2004 +0000
+++ b/sys/arch/i386/i386/machdep.c      Mon May 03 16:38:28 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.553 2004/04/30 02:05:43 lukem Exp $      */
+/*     $NetBSD: machdep.c,v 1.554 2004/05/03 16:38:28 lukem Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.553 2004/04/30 02:05:43 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.554 2004/05/03 16:38:28 lukem Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -538,6 +538,11 @@
                       CTLTYPE_INT, "sse2", NULL,
                       NULL, 0, &i386_has_sse2, 0,
                       CTL_MACHDEP, CPU_SSE2, CTL_EOL);
+       sysctl_createv(clog, 0, NULL, NULL, 
+                      CTLFLAG_PERMANENT,
+                      CTLTYPE_STRING, "cpu_brand", NULL,
+                      NULL, 0, &cpu_brand_string, 0,
+                      CTL_MACHDEP, CTL_CREATE, CTL_EOL);
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
                       CTLTYPE_INT, "tm_longrun_mode", NULL,