[src/trunk]: src/sys/arch Now that MACHINE is defined in user-land in either

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

details:   https://anonhg.NetBSD.org/src/rev/c1752f4eff68
branches:  trunk
changeset: 762968:c1752f4eff68
user:      he <he%NetBSD.org@localhost>
date:      Sun Mar 06 20:34:55 2011 +0000

description:
Now that MACHINE is defined in user-land in either
mips/include/mips_param.h or powerpc/include/param.h, stop
trying to re-define it in the port-specific param.h files
when _KERNEL isn't defined.

diffstat:

 sys/arch/arc/include/param.h      |  4 +++-
 sys/arch/bebox/include/param.h    |  4 +++-
 sys/arch/cobalt/include/param.h   |  4 +++-
 sys/arch/newsmips/include/param.h |  4 +++-
 sys/arch/pmax/include/param.h     |  4 +++-
 sys/arch/sbmips/include/param.h   |  4 +++-
 sys/arch/sgimips/include/param.h  |  4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diffs (133 lines):

diff -r b26d80e3ee75 -r c1752f4eff68 sys/arch/arc/include/param.h
--- a/sys/arch/arc/include/param.h      Sun Mar 06 18:22:13 2011 +0000
+++ b/sys/arch/arc/include/param.h      Sun Mar 06 20:34:55 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.27 2011/02/08 20:20:09 rmind Exp $ */
+/*     $NetBSD: param.h,v 1.28 2011/03/06 20:34:57 he Exp $    */
 /*      $OpenBSD: param.h,v 1.9 1997/04/30 09:54:15 niklas Exp $ */
 
 /*
@@ -56,7 +56,9 @@
 #define        _MACHINE_ARCH   mipsel
 #define        MACHINE_ARCH    "mipsel"
 #define        _MACHINE        arc
+#ifdef _KERNEL
 #define        MACHINE         "arc"
+#endif
 
 #define        KERNBASE        0x80000000      /* start of kernel virtual */
 #define        BTOPKERNBASE    ((u_long)KERNBASE >> PGSHIFT)
diff -r b26d80e3ee75 -r c1752f4eff68 sys/arch/bebox/include/param.h
--- a/sys/arch/bebox/include/param.h    Sun Mar 06 18:22:13 2011 +0000
+++ b/sys/arch/bebox/include/param.h    Sun Mar 06 20:34:55 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.11 2010/08/01 06:13:19 kiyohara Exp $      */
+/*     $NetBSD: param.h,v 1.12 2011/03/06 20:34:57 he Exp $    */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -42,7 +42,9 @@
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
+#ifdef _KERNEL
 #define        MACHINE         "bebox"
+#endif
 
 #define        __NO_FIXED_MSGBUF
 
diff -r b26d80e3ee75 -r c1752f4eff68 sys/arch/cobalt/include/param.h
--- a/sys/arch/cobalt/include/param.h   Sun Mar 06 18:22:13 2011 +0000
+++ b/sys/arch/cobalt/include/param.h   Sun Mar 06 20:34:55 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.17 2011/02/08 20:20:11 rmind Exp $ */
+/*     $NetBSD: param.h,v 1.18 2011/03/06 20:34:57 he Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -40,7 +40,9 @@
 #include <mips/mips_param.h>
 
 #define        _MACHINE        cobalt
+#ifdef _KERNEL
 #define        MACHINE         "cobalt"
+#endif
 
 #define        DEV_BSIZE       512
 #define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
diff -r b26d80e3ee75 -r c1752f4eff68 sys/arch/newsmips/include/param.h
--- a/sys/arch/newsmips/include/param.h Sun Mar 06 18:22:13 2011 +0000
+++ b/sys/arch/newsmips/include/param.h Sun Mar 06 20:34:55 2011 +0000
@@ -1,4 +1,4 @@
-/*     from $NetBSD: param.h,v 1.19 2011/02/08 20:20:21 rmind Exp $    */
+/*     from $NetBSD: param.h,v 1.20 2011/03/06 20:34:57 he Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -52,7 +52,9 @@
  */
 
 #define        _MACHINE        newsmips
+#ifdef _KERNEL
 #define        MACHINE         "newsmips"
+#endif
 
 #define        KERNBASE        0x80000000      /* start of kernel virtual */
 #define KERNTEXTOFF    0x80001000      /* start of kernel text for kvm_mkdb */
diff -r b26d80e3ee75 -r c1752f4eff68 sys/arch/pmax/include/param.h
--- a/sys/arch/pmax/include/param.h     Sun Mar 06 18:22:13 2011 +0000
+++ b/sys/arch/pmax/include/param.h     Sun Mar 06 20:34:55 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.43 2011/02/20 07:50:25 matt Exp $  */
+/*     $NetBSD: param.h,v 1.44 2011/03/06 20:34:56 he Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -52,7 +52,9 @@
  */
 
 #define        _MACHINE        pmax
+#ifdef _KERNEL
 #define        MACHINE         "pmax"
+#endif
 
 #define        DEV_BSIZE       512
 #define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
diff -r b26d80e3ee75 -r c1752f4eff68 sys/arch/sbmips/include/param.h
--- a/sys/arch/sbmips/include/param.h   Sun Mar 06 18:22:13 2011 +0000
+++ b/sys/arch/sbmips/include/param.h   Sun Mar 06 20:34:55 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.8 2011/02/08 20:20:23 rmind Exp $  */
+/*     $NetBSD: param.h,v 1.9 2011/03/06 20:34:56 he Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -48,7 +48,9 @@
  */
 
 #define        _MACHINE        sbmips
+#ifdef _KERNEL
 #define        MACHINE         "sbmips"
+#endif
 
 #define        DEV_BSIZE       512
 #define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
diff -r b26d80e3ee75 -r c1752f4eff68 sys/arch/sgimips/include/param.h
--- a/sys/arch/sgimips/include/param.h  Sun Mar 06 18:22:13 2011 +0000
+++ b/sys/arch/sgimips/include/param.h  Sun Mar 06 20:34:55 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.13 2011/02/08 20:20:23 rmind Exp $ */
+/*     $NetBSD: param.h,v 1.14 2011/03/06 20:34:55 he Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -44,7 +44,9 @@
 #include <mips/mips_param.h>
 
 #define        _MACHINE        sgimips
+#ifdef _KERNEL
 #define        MACHINE         "sgimips"
+#endif
 
 #define        DEV_BSIZE       512
 #define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */