Module Name: src
Committed By: matt
Date: Fri Mar 2 16:20:55 UTC 2012
Modified Files:
src/sys/arch/evbmips/adm5120: machdep.c
src/sys/arch/evbmips/alchemy: machdep.c
src/sys/arch/evbmips/atheros: machdep.c
src/sys/arch/evbmips/malta: machdep.c
src/sys/arch/evbmips/rasoc: machdep.c
src/sys/arch/evbmips/rmixl: machdep.c
Log Message:
Remove reduntant/conflicting common declarations.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbmips/adm5120/machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbmips/alchemy/machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbmips/atheros/machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbmips/malta/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/rasoc/machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/rmixl/machdep.c
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/evbmips/adm5120/machdep.c
diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.21 src/sys/arch/evbmips/adm5120/machdep.c:1.22
--- src/sys/arch/evbmips/adm5120/machdep.c:1.21 Sun Jul 10 00:03:52 2011
+++ src/sys/arch/evbmips/adm5120/machdep.c Fri Mar 2 16:20:55 2012
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
/* 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;
Index: src/sys/arch/evbmips/alchemy/machdep.c
diff -u src/sys/arch/evbmips/alchemy/machdep.c:1.51 src/sys/arch/evbmips/alchemy/machdep.c:1.52
--- src/sys/arch/evbmips/alchemy/machdep.c:1.51 Sun Jul 10 00:03:52 2011
+++ src/sys/arch/evbmips/alchemy/machdep.c Fri Mar 2 16:20:55 2012
@@ -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 @@ int aucomcnrate = 0;
/* 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;
Index: src/sys/arch/evbmips/atheros/machdep.c
diff -u src/sys/arch/evbmips/atheros/machdep.c:1.27 src/sys/arch/evbmips/atheros/machdep.c:1.28
--- src/sys/arch/evbmips/atheros/machdep.c:1.27 Sun Jul 10 00:03:53 2011
+++ src/sys/arch/evbmips/atheros/machdep.c Fri Mar 2 16:20:55 2012
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
/* 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;
Index: src/sys/arch/evbmips/malta/machdep.c
diff -u src/sys/arch/evbmips/malta/machdep.c:1.41 src/sys/arch/evbmips/malta/machdep.c:1.42
--- src/sys/arch/evbmips/malta/machdep.c:1.41 Sun Jul 10 00:03:53 2011
+++ src/sys/arch/evbmips/malta/machdep.c Fri Mar 2 16:20:55 2012
@@ -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 @@ extern char cpu_model[];
/* 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;
Index: src/sys/arch/evbmips/rasoc/machdep.c
diff -u src/sys/arch/evbmips/rasoc/machdep.c:1.6 src/sys/arch/evbmips/rasoc/machdep.c:1.7
--- src/sys/arch/evbmips/rasoc/machdep.c:1.6 Wed Feb 1 02:05:14 2012
+++ src/sys/arch/evbmips/rasoc/machdep.c Fri Mar 2 16:20:55 2012
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#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
Index: src/sys/arch/evbmips/rmixl/machdep.c
diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.11 src/sys/arch/evbmips/rmixl/machdep.c:1.12
--- src/sys/arch/evbmips/rmixl/machdep.c:1.11 Sun Feb 12 16:34:08 2012
+++ src/sys/arch/evbmips/rmixl/machdep.c Fri Mar 2 16:20:55 2012
@@ -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 @@ struct cpu_info cpu_info_store;
/* Maps for VM objects. */
struct vm_map *phys_map = NULL;
-int physmem; /* Total physical memory */
-
int netboot; /* Are we netbooting? */
