[src/trunk]: src/sys/arch/evbmips Remove reduntant/conflicting common declara...

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

details:   https://anonhg.NetBSD.org/src/rev/d3e4affd3f89
branches:  trunk
changeset: 777722:d3e4affd3f89
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Mar 02 16:20:55 2012 +0000

description:
Remove reduntant/conflicting common declarations.

diffstat:

 sys/arch/evbmips/adm5120/machdep.c |   5 ++---
 sys/arch/evbmips/alchemy/machdep.c |   5 ++---
 sys/arch/evbmips/atheros/machdep.c |   5 ++---
 sys/arch/evbmips/malta/machdep.c   |   6 ++----
 sys/arch/evbmips/rasoc/machdep.c   |  11 +++--------
 sys/arch/evbmips/rmixl/machdep.c   |   6 ++----
 6 files changed, 13 insertions(+), 25 deletions(-)

diffs (168 lines):

diff -r f0a2fb4faa6c -r d3e4affd3f89 sys/arch/evbmips/adm5120/machdep.c
--- a/sys/arch/evbmips/adm5120/machdep.c        Fri Mar 02 16:19:52 2012 +0000
+++ b/sys/arch/evbmips/adm5120/machdep.c        Fri Mar 02 16:20:55 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.22 2012/03/02 16:20:55 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2012/03/02 16:20:55 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -126,7 +126,6 @@
 /* Maps for VM objects. */
 struct vm_map *phys_map = NULL;
 
-int physmem;                   /* # pages of physical memory */
 int maxmem;                    /* max memory per process */
 
 int mem_cluster_cnt;
diff -r f0a2fb4faa6c -r d3e4affd3f89 sys/arch/evbmips/alchemy/machdep.c
--- a/sys/arch/evbmips/alchemy/machdep.c        Fri Mar 02 16:19:52 2012 +0000
+++ b/sys/arch/evbmips/alchemy/machdep.c        Fri Mar 02 16:20:55 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.51 2011/07/10 00:03:52 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.52 2012/03/02 16:20:55 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2011/07/10 00:03:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2012/03/02 16:20:55 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -130,7 +130,6 @@
 /* Maps for VM objects. */
 struct vm_map *phys_map = NULL;
 
-int physmem;                   /* # pages of physical memory */
 int maxmem;                    /* max memory per process */
 
 int mem_cluster_cnt;
diff -r f0a2fb4faa6c -r d3e4affd3f89 sys/arch/evbmips/atheros/machdep.c
--- a/sys/arch/evbmips/atheros/machdep.c        Fri Mar 02 16:19:52 2012 +0000
+++ b/sys/arch/evbmips/atheros/machdep.c        Fri Mar 02 16:20:55 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.27 2011/07/10 00:03:53 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.28 2012/03/02 16:20:55 matt Exp $ */
 
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2011/07/10 00:03:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2012/03/02 16:20:55 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -146,7 +146,6 @@
 /* Maps for VM objects. */
 struct vm_map *phys_map = NULL;
 
-int physmem;                   /* # pages of physical memory */
 int maxmem;                    /* max memory per process */
 
 int mem_cluster_cnt;
diff -r f0a2fb4faa6c -r d3e4affd3f89 sys/arch/evbmips/malta/machdep.c
--- a/sys/arch/evbmips/malta/machdep.c  Fri Mar 02 16:19:52 2012 +0000
+++ b/sys/arch/evbmips/malta/machdep.c  Fri Mar 02 16:20:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.41 2011/07/10 00:03:53 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.42 2012/03/02 16:20:55 matt Exp $        */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2011/07/10 00:03:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.42 2012/03/02 16:20:55 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
@@ -132,8 +132,6 @@
 /* Maps for VM objects. */
 struct vm_map *phys_map = NULL;
 
-int    physmem;                /* Total physical memory */
-
 int    netboot;                /* Are we netbooting? */
 
 yamon_env_var *yamon_envp;
diff -r f0a2fb4faa6c -r d3e4affd3f89 sys/arch/evbmips/rasoc/machdep.c
--- a/sys/arch/evbmips/rasoc/machdep.c  Fri Mar 02 16:19:52 2012 +0000
+++ b/sys/arch/evbmips/rasoc/machdep.c  Fri Mar 02 16:20:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.6 2012/02/01 02:05:14 matt Exp $ */
+/*     $NetBSD: machdep.c,v 1.7 2012/03/02 16:20:55 matt Exp $ */
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2012/02/01 02:05:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2012/03/02 16:20:55 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/boot_flag.h>
@@ -52,16 +52,11 @@
 #include <mips/ralink/ralink_var.h>
 
 /* structures we define/alloc for other files in the kernel */
-struct vm_map *mb_map = NULL;
 struct vm_map *phys_map = NULL;
-struct cpu_info cpu_info_store;
-int physmem;           /* # pages of physical memory */
+
 int mem_cluster_cnt = 0;
 phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
 
-/* structures others define for us */
-extern struct user *proc0paddr;
-
 void mach_init(void);
 
 static inline uint32_t
diff -r f0a2fb4faa6c -r d3e4affd3f89 sys/arch/evbmips/rmixl/machdep.c
--- a/sys/arch/evbmips/rmixl/machdep.c  Fri Mar 02 16:19:52 2012 +0000
+++ b/sys/arch/evbmips/rmixl/machdep.c  Fri Mar 02 16:20:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.11 2012/02/12 16:34:08 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.12 2012/03/02 16:20:55 matt Exp $        */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2012/02/12 16:34:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2012/03/02 16:20:55 matt Exp $");
 
 #define __INTR_PRIVATE
 
@@ -203,8 +203,6 @@
 /* Maps for VM objects. */
 struct vm_map *phys_map = NULL;
 
-int    physmem;                /* Total physical memory */
-
 int    netboot;                /* Are we netbooting? */