Module Name: src Committed By: he Date: Sun Mar 6 20:34:58 UTC 2011
Modified Files: src/sys/arch/arc/include: param.h src/sys/arch/bebox/include: param.h src/sys/arch/cobalt/include: param.h src/sys/arch/newsmips/include: param.h src/sys/arch/pmax/include: param.h src/sys/arch/sbmips/include: param.h src/sys/arch/sgimips/include: param.h Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arc/include/param.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/bebox/include/param.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cobalt/include/param.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/newsmips/include/param.h cvs rdiff -u -r1.43 -r1.44 src/sys/arch/pmax/include/param.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sbmips/include/param.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arc/include/param.h diff -u src/sys/arch/arc/include/param.h:1.27 src/sys/arch/arc/include/param.h:1.28 --- src/sys/arch/arc/include/param.h:1.27 Tue Feb 8 20:20:09 2011 +++ src/sys/arch/arc/include/param.h Sun Mar 6 20:34:57 2011 @@ -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) Index: src/sys/arch/bebox/include/param.h diff -u src/sys/arch/bebox/include/param.h:1.11 src/sys/arch/bebox/include/param.h:1.12 --- src/sys/arch/bebox/include/param.h:1.11 Sun Aug 1 06:13:19 2010 +++ src/sys/arch/bebox/include/param.h Sun Mar 6 20:34:57 2011 @@ -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 Index: src/sys/arch/cobalt/include/param.h diff -u src/sys/arch/cobalt/include/param.h:1.17 src/sys/arch/cobalt/include/param.h:1.18 --- src/sys/arch/cobalt/include/param.h:1.17 Tue Feb 8 20:20:11 2011 +++ src/sys/arch/cobalt/include/param.h Sun Mar 6 20:34:57 2011 @@ -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) */ Index: src/sys/arch/newsmips/include/param.h diff -u src/sys/arch/newsmips/include/param.h:1.19 src/sys/arch/newsmips/include/param.h:1.20 --- src/sys/arch/newsmips/include/param.h:1.19 Tue Feb 8 20:20:21 2011 +++ src/sys/arch/newsmips/include/param.h Sun Mar 6 20:34:57 2011 @@ -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 */ Index: src/sys/arch/pmax/include/param.h diff -u src/sys/arch/pmax/include/param.h:1.43 src/sys/arch/pmax/include/param.h:1.44 --- src/sys/arch/pmax/include/param.h:1.43 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/include/param.h Sun Mar 6 20:34:56 2011 @@ -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) */ Index: src/sys/arch/sbmips/include/param.h diff -u src/sys/arch/sbmips/include/param.h:1.8 src/sys/arch/sbmips/include/param.h:1.9 --- src/sys/arch/sbmips/include/param.h:1.8 Tue Feb 8 20:20:23 2011 +++ src/sys/arch/sbmips/include/param.h Sun Mar 6 20:34:56 2011 @@ -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) */ Index: src/sys/arch/sgimips/include/param.h diff -u src/sys/arch/sgimips/include/param.h:1.13 src/sys/arch/sgimips/include/param.h:1.14 --- src/sys/arch/sgimips/include/param.h:1.13 Tue Feb 8 20:20:23 2011 +++ src/sys/arch/sgimips/include/param.h Sun Mar 6 20:34:55 2011 @@ -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) */