We do not need a char machine_arch[] constant.

ok deraadt@

11 files changed, 16 insertions, 26 deletions

diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index bee315e6362..6a8a2746e9d 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.34 2005/08/01 16:18:43 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.35 2005/08/06 14:26:50 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $	*/
 
 /*-
@@ -148,8 +148,7 @@ extern struct acpi_softc *acpi_softc;
 #endif
 
 /* the following is used externally (sysctl_hw) */
-char machine[] = "amd64";		/* cpu "architecture" */
-char machine_arch[] = "amd64";		/* machine == machine_arch */
+char machine[] = MACHINE;
 
 #ifdef CPURESET_DELAY
 int	cpureset_delay = CPURESET_DELAY;
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index 2b7a44e17b3..ffe1de40673 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arm32_machdep.c,v 1.14 2005/08/01 15:42:46 miod Exp $	*/
+/*	$OpenBSD: arm32_machdep.c,v 1.15 2005/08/06 14:26:51 miod Exp $	*/
 /*	$NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $	*/
 
 /*
@@ -104,7 +104,6 @@ pv_addr_t kernelstack;
 
 /* the following is used externally (sysctl_hw) */
 char	machine[] = MACHINE;		/* from <machine/param.h> */
-char	machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 
 /* Our exported CPU info; we can have only one. */
 struct cpu_info cpu_info_store;
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 176c8ffe006..cb076b0edf1 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.147 2005/07/11 04:04:30 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.148 2005/08/06 14:26:52 miod Exp $	*/
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -136,7 +136,7 @@ struct pdc_model pdc_model PDC_ALIGNMENT;
 u_int	cpu_ticksnum, cpu_ticksdenom;
 
 	/* exported info */
-char	machine[] = MACHINE_ARCH;
+char	machine[] = MACHINE;
 char	cpu_model[128];
 enum hppa_cpu_type cpu_type;
 const char *cpu_typename;
diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c
index 4f47ca92e49..d4342b253f1 100644
--- a/sys/arch/hppa64/hppa64/machdep.c
+++ b/sys/arch/hppa64/hppa64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.1 2005/04/01 10:40:47 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.2 2005/08/06 14:26:52 miod Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -123,7 +123,7 @@ struct pdc_model pdc_model PDC_ALIGNMENT;
 u_int	cpu_ticksnum, cpu_ticksdenom;
 
 	/* exported info */
-char	machine[] = MACHINE_ARCH;
+char	machine[] = MACHINE;
 char	cpu_model[128];
 int	cpu_hvers;
 enum hppa_cpu_type cpu_type;
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index c658f2f8ee4..4d2e4602190 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.322 2005/07/18 14:55:49 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.323 2005/08/06 14:26:52 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -181,8 +181,7 @@ extern struct proc *npxproc;
 #define FREE_PGS(pgs) uvm_pglistfree(&(pgs))
 
 /* the following is used externally (sysctl_hw) */
-char machine[] = "i386";		/* cpu "architecture" */
-char machine_arch[] = "i386";		/* machine == machine_arch */
+char machine[] = MACHINE;
 
 /*
  * Declare these as initialized data so we can patch them.
diff --git a/sys/arch/m68k/m68k/m68k_machdep.c b/sys/arch/m68k/m68k/m68k_machdep.c
index 9cd5957440f..d2c805e0da0 100644
--- a/sys/arch/m68k/m68k/m68k_machdep.c
+++ b/sys/arch/m68k/m68k/m68k_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m68k_machdep.c,v 1.5 2003/01/05 01:51:27 miod Exp $	*/
+/*	$OpenBSD: m68k_machdep.c,v 1.6 2005/08/06 14:26:52 miod Exp $	*/
 /*	$NetBSD: m68k_machdep.c,v 1.3 1997/06/12 09:57:04 veego Exp $	*/
 
 /*-
@@ -46,9 +46,6 @@
 #include <machine/frame.h>
 #include <machine/reg.h>
 
-/* the following is used externally (sysctl_hw) */
-char	machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
-
 /*
  * Process the tail end of a fork() for the child
  */
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 9500076003a..9f5066b499d 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.87 2004/09/29 07:34:42 miod Exp $ */
+/*	$OpenBSD: machdep.c,v 1.88 2005/08/06 14:26:52 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -115,7 +115,7 @@
 #include <uvm/uvm_extern.h>
 
 /* the following is used externally (sysctl_hw) */
-char machine[] = "mvme68k";		/* cpu "architecture" */
+char machine[] = MACHINE;		/* cpu "architecture" */
 
 struct vm_map *exec_map = NULL;
 struct vm_map *phys_map = NULL;
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 33858001813..13675f59d8c 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.23 2005/02/20 15:39:04 miod Exp $ */
+/*	$OpenBSD: machdep.c,v 1.24 2005/08/06 14:26:52 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -97,7 +97,6 @@ void dump_tlb(void);
 
 /* the following is used externally (sysctl_hw) */
 char	machine[] = MACHINE;		/* machine "architecture" */
-char	machine_arch[] = MACHINE_ARCH;	/* cpu "architecture" */
 char	cpu_model[30];
 #ifdef APERTURE
 #if defined(INSECURE) || defined(DEBUG)
diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c
index 028b0483efa..bae96f10900 100644
--- a/sys/arch/sparc/sparc/cpu.c
+++ b/sys/arch/sparc/sparc/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.40 2005/04/19 21:30:20 miod Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.41 2005/08/06 14:26:52 miod Exp $	*/
 /*	$NetBSD: cpu.c,v 1.56 1997/09/15 20:52:36 pk Exp $ */
 
 /*
@@ -81,7 +81,6 @@
 
 /* The following are used externally (sysctl_hw). */
 char	machine[] = MACHINE;		/* from <machine/param.h> */
-char	machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 char	*cpu_class = "sun4";
 char	cpu_model[130];
 char	cpu_hotfix[40];
diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c
index cbcc926e9eb..5b7fdd1c659 100644
--- a/sys/arch/sparc64/sparc64/cpu.c
+++ b/sys/arch/sparc64/sparc64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.13 2003/05/11 22:09:31 jason Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.14 2005/08/06 14:26:52 miod Exp $	*/
 /*	$NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */
 
 /*
@@ -77,7 +77,6 @@ struct cpu_info *cpus = NULL;
 
 /* The following are used externally (sysctl_hw). */
 char	machine[] = MACHINE;		/* from <machine/param.h> */
-char	machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 char	cpu_model[100];
 
 struct	proc *fpproc;
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 7a7da5b2222..aa601ee081a 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.72 2005/06/08 17:03:03 henning Exp $ */
+/* $OpenBSD: machdep.c,v 1.73 2005/08/06 14:26:52 miod Exp $ */
 /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $	 */
 
 /*
@@ -139,7 +139,6 @@ extern int virtual_avail, virtual_end;
  */
 int		want_resched;
 char		machine[] = MACHINE;		/* from <machine/param.h> */
-char		machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
 int		physmem;
 int		dumpsize = 0;
 int		cold = 1; /* coldstart */