Module Name: src
Committed By: matt
Date: Tue Feb 14 01:25:53 UTC 2012
Modified Files:
src/sys/arch/algor/algor [matt-nb5-mips64]: machdep.c
src/sys/arch/arc/arc [matt-nb5-mips64]: machdep.c
src/sys/arch/cobalt/cobalt [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/adm5120 [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/alchemy [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/atheros [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/malta [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/rasoc [matt-nb5-mips64]: machdep.c
src/sys/arch/ews4800mips/ews4800mips [matt-nb5-mips64]: machdep.c
src/sys/arch/hpcmips/hpcmips [matt-nb5-mips64]: machdep.c
src/sys/arch/mipsco/mipsco [matt-nb5-mips64]: machdep.c
src/sys/arch/newsmips/newsmips [matt-nb5-mips64]: machdep.c
src/sys/arch/playstation2/playstation2 [matt-nb5-mips64]: machdep.c
src/sys/arch/pmax/pmax [matt-nb5-mips64]: machdep.c
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: machdep.c
src/sys/arch/sgimips/sgimips [matt-nb5-mips64]: machdep.c
Log Message:
mem_cluster_cnt on mips is now a u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.38.10.7 -r1.38.10.8 src/sys/arch/algor/algor/machdep.c
cvs rdiff -u -r1.112.10.4 -r1.112.10.5 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.98.10.5 -r1.98.10.6 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.6.10.6 -r1.6.10.7 src/sys/arch/evbmips/adm5120/machdep.c
cvs rdiff -u -r1.37.10.6 -r1.37.10.7 src/sys/arch/evbmips/alchemy/machdep.c
cvs rdiff -u -r1.13.10.7 -r1.13.10.8 src/sys/arch/evbmips/atheros/machdep.c
cvs rdiff -u -r1.28.10.9 -r1.28.10.10 src/sys/arch/evbmips/malta/machdep.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbmips/rasoc/machdep.c
cvs rdiff -u -r1.14.10.4 -r1.14.10.5 \
src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.96.10.6 -r1.96.10.7 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.58.10.4 -r1.58.10.5 src/sys/arch/mipsco/mipsco/machdep.c
cvs rdiff -u -r1.98.10.6 -r1.98.10.7 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.23.10.2 -r1.23.10.3 \
src/sys/arch/playstation2/playstation2/machdep.c
cvs rdiff -u -r1.223.8.1.2.10 -r1.223.8.1.2.11 \
src/sys/arch/pmax/pmax/machdep.c
cvs rdiff -u -r1.38.10.10 -r1.38.10.11 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.121.8.6 -r1.121.8.7 src/sys/arch/sgimips/sgimips/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/algor/algor/machdep.c
diff -u src/sys/arch/algor/algor/machdep.c:1.38.10.7 src/sys/arch/algor/algor/machdep.c:1.38.10.8
--- src/sys/arch/algor/algor/machdep.c:1.38.10.7 Sun Mar 21 17:38:32 2010
+++ src/sys/arch/algor/algor/machdep.c Tue Feb 14 01:25:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38.10.7 2010/03/21 17:38:32 cliff Exp $ */
+/* machdep.c,v 1.38.10.7 2010/03/21 17:38:32 cliff Exp */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.7 2010/03/21 17:38:32 cliff Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.38.10.7 2010/03/21 17:38:32 cliff Exp");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -195,7 +195,7 @@ struct vm_map *phys_map = NULL;
int physmem; /* # pages of physical memory */
int maxmem; /* max memory per process */
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
char algor_ethaddr[ETHER_ADDR_LEN];
Index: src/sys/arch/arc/arc/machdep.c
diff -u src/sys/arch/arc/arc/machdep.c:1.112.10.4 src/sys/arch/arc/arc/machdep.c:1.112.10.5
--- src/sys/arch/arc/arc/machdep.c:1.112.10.4 Sun Mar 21 17:38:33 2010
+++ src/sys/arch/arc/arc/machdep.c Tue Feb 14 01:25:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.112.10.4 2010/03/21 17:38:33 cliff Exp $ */
+/* machdep.c,v 1.112.10.4 2010/03/21 17:38:33 cliff Exp */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -78,7 +78,7 @@
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112.10.4 2010/03/21 17:38:33 cliff Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.112.10.4 2010/03/21 17:38:33 cliff Exp");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -198,7 +198,7 @@ char **environment; /* On some arches,
int mem_reserved[VM_PHYSSEG_MAX]; /* the cluster is reserved, i.e. not free */
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
/* initialize bss, etc. from kernel start, before main() is called. */
void mach_init(int, char *[], u_int, void *);
Index: src/sys/arch/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.98.10.5 src/sys/arch/cobalt/cobalt/machdep.c:1.98.10.6
--- src/sys/arch/cobalt/cobalt/machdep.c:1.98.10.5 Fri Dec 24 07:52:01 2010
+++ src/sys/arch/cobalt/cobalt/machdep.c Tue Feb 14 01:25:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98.10.5 2010/12/24 07:52:01 matt Exp $ */
+/* machdep.c,v 1.98.10.5 2010/12/24 07:52:01 matt Exp */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.5 2010/12/24 07:52:01 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.98.10.5 2010/12/24 07:52:01 matt Exp");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -123,7 +123,7 @@ static const char * const cobalt_model[]
#define COBALT_MODELS __arraycount(cobalt_model)
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
void mach_init(uint32_t, u_int, uint32_t);
void decode_bootstring(void);
Index: src/sys/arch/evbmips/adm5120/machdep.c
diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.6 src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.7
--- src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.6 Fri May 20 16:38:51 2011
+++ src/sys/arch/evbmips/adm5120/machdep.c Tue Feb 14 01:25:51 2012
@@ -166,7 +166,7 @@ struct vm_map *phys_map = NULL;
int physmem; /* # pages of physical memory */
int maxmem; /* max memory per process */
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
struct adm5120_config adm5120_configuration;
Index: src/sys/arch/evbmips/alchemy/machdep.c
diff -u src/sys/arch/evbmips/alchemy/machdep.c:1.37.10.6 src/sys/arch/evbmips/alchemy/machdep.c:1.37.10.7
--- src/sys/arch/evbmips/alchemy/machdep.c:1.37.10.6 Fri May 13 17:30:43 2011
+++ src/sys/arch/evbmips/alchemy/machdep.c Tue Feb 14 01:25:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.37.10.6 2011/05/13 17:30:43 matt Exp $ */
+/* machdep.c,v 1.37.10.6 2011/05/13 17:30:43 matt Exp */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37.10.6 2011/05/13 17:30:43 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.37.10.6 2011/05/13 17:30:43 matt Exp");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -168,7 +168,7 @@ struct vm_map *phys_map = NULL;
int physmem; /* # pages of physical memory */
int maxmem; /* max memory per process */
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
yamon_env_var *yamon_envp;
Index: src/sys/arch/evbmips/atheros/machdep.c
diff -u src/sys/arch/evbmips/atheros/machdep.c:1.13.10.7 src/sys/arch/evbmips/atheros/machdep.c:1.13.10.8
--- src/sys/arch/evbmips/atheros/machdep.c:1.13.10.7 Fri May 13 17:30:43 2011
+++ src/sys/arch/evbmips/atheros/machdep.c Tue Feb 14 01:25:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13.10.7 2011/05/13 17:30:43 matt Exp $ */
+/* machdep.c,v 1.13.10.7 2011/05/13 17:30:43 matt Exp */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -147,7 +147,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13.10.7 2011/05/13 17:30:43 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.13.10.7 2011/05/13 17:30:43 matt Exp");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -189,7 +189,7 @@ struct vm_map *phys_map = NULL;
int physmem; /* # pages of physical memory */
int maxmem; /* max memory per process */
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
void mach_init(void); /* XXX */
Index: src/sys/arch/evbmips/malta/machdep.c
diff -u src/sys/arch/evbmips/malta/machdep.c:1.28.10.9 src/sys/arch/evbmips/malta/machdep.c:1.28.10.10
--- src/sys/arch/evbmips/malta/machdep.c:1.28.10.9 Fri Apr 29 08:26:18 2011
+++ src/sys/arch/evbmips/malta/machdep.c Tue Feb 14 01:25:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.28.10.9 2011/04/29 08:26:18 matt Exp $ */
+/* machdep.c,v 1.28.10.9 2011/04/29 08:26:18 matt Exp */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28.10.9 2011/04/29 08:26:18 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.28.10.9 2011/04/29 08:26:18 matt Exp");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -178,7 +178,7 @@ int netboot; /* Are we netbooting? */
yamon_env_var *yamon_envp;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
void configure(void);
void mach_init(int, char **, yamon_env_var *, u_long);
Index: src/sys/arch/evbmips/rasoc/machdep.c
diff -u src/sys/arch/evbmips/rasoc/machdep.c:1.1.2.1 src/sys/arch/evbmips/rasoc/machdep.c:1.1.2.2
--- src/sys/arch/evbmips/rasoc/machdep.c:1.1.2.1 Fri Jul 1 05:45:44 2011
+++ src/sys/arch/evbmips/rasoc/machdep.c Tue Feb 14 01:25:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1.2.1 2011/07/01 05:45:44 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.1.2.2 2012/02/14 01:25:52 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.1.2.1 2011/07/01 05:45:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1.2.2 2012/02/14 01:25:52 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ 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;
+u_int mem_cluster_cnt = 0;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
/* structures others define for us */
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14.10.4 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14.10.5
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14.10.4 Sun Mar 21 17:38:34 2010
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Tue Feb 14 01:25:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14.10.4 2010/03/21 17:38:34 cliff Exp $ */
+/* machdep.c,v 1.14.10.4 2010/03/21 17:38:34 cliff Exp */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14.10.4 2010/03/21 17:38:34 cliff Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.14.10.4 2010/03/21 17:38:34 cliff Exp");
#include "opt_ddb.h"
@@ -80,7 +80,7 @@ struct vm_map *phys_map;
int physmem; /* max supported memory, changes to actual */
/* referenced by mips_machdep.c:cpu_dump() */
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
void mach_init(int, char *[], struct bootinfo *);
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.6 src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.7
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.6 Wed Dec 29 08:16:22 2010
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Tue Feb 14 01:25:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.96.10.6 2010/12/29 08:16:22 matt Exp $ */
+/* machdep.c,v 1.96.10.6 2010/12/29 08:16:22 matt Exp */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -108,7 +108,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96.10.6 2010/12/29 08:16:22 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.96.10.6 2010/12/29 08:16:22 matt Exp");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -224,7 +224,7 @@ struct vm_map *phys_map;
/* physical memory */
int physmem; /* max supported memory, changes to actual */
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
/*
Index: src/sys/arch/mipsco/mipsco/machdep.c
diff -u src/sys/arch/mipsco/mipsco/machdep.c:1.58.10.4 src/sys/arch/mipsco/mipsco/machdep.c:1.58.10.5
--- src/sys/arch/mipsco/mipsco/machdep.c:1.58.10.4 Wed Dec 29 08:16:21 2010
+++ src/sys/arch/mipsco/mipsco/machdep.c Tue Feb 14 01:25:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.58.10.4 2010/12/29 08:16:21 matt Exp $ */
+/* machdep.c,v 1.58.10.4 2010/12/29 08:16:21 matt Exp */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58.10.4 2010/12/29 08:16:21 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.58.10.4 2010/12/29 08:16:21 matt Exp");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -148,7 +148,7 @@ int physmem; /* max supported memory, c
char *bootinfo = NULL; /* pointer to bootinfo structure */
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
void to_monitor(int) __dead;
void prom_halt(int) __dead;
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.6 src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.7
--- src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.6 Wed Dec 29 08:14:43 2010
+++ src/sys/arch/newsmips/newsmips/machdep.c Tue Feb 14 01:25:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98.10.6 2010/12/29 08:14:43 matt Exp $ */
+/* machdep.c,v 1.98.10.6 2010/12/29 08:14:43 matt Exp */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.6 2010/12/29 08:14:43 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.98.10.6 2010/12/29 08:14:43 matt Exp");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -155,7 +155,7 @@ int systype; /* what type of NEWS we a
struct apbus_sysinfo *_sip = NULL;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
struct idrom idrom;
void (*hardware_intr)(int, vaddr_t, uint32_t);
Index: src/sys/arch/playstation2/playstation2/machdep.c
diff -u src/sys/arch/playstation2/playstation2/machdep.c:1.23.10.2 src/sys/arch/playstation2/playstation2/machdep.c:1.23.10.3
--- src/sys/arch/playstation2/playstation2/machdep.c:1.23.10.2 Sun Mar 21 17:38:34 2010
+++ src/sys/arch/playstation2/playstation2/machdep.c Tue Feb 14 01:25:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.23.10.2 2010/03/21 17:38:34 cliff Exp $ */
+/* machdep.c,v 1.23.10.2 2010/03/21 17:38:34 cliff Exp */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23.10.2 2010/03/21 17:38:34 cliff Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.23.10.2 2010/03/21 17:38:34 cliff Exp");
#include "opt_ddb.h"
#include "opt_kloader.h"
@@ -75,7 +75,7 @@ struct cpu_info cpu_info_store;
struct vm_map *mb_map;
struct vm_map *phys_map;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
int physmem; /* for buffer cache, vnode cache estimation */
#ifdef DEBUG
Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.223.8.1.2.10 src/sys/arch/pmax/pmax/machdep.c:1.223.8.1.2.11
--- src/sys/arch/pmax/pmax/machdep.c:1.223.8.1.2.10 Fri Dec 23 23:25:42 2011
+++ src/sys/arch/pmax/pmax/machdep.c Tue Feb 14 01:25:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.223.8.1.2.10 2011/12/23 23:25:42 matt Exp $ */
+/* machdep.c,v 1.223.8.1.2.10 2011/12/23 23:25:42 matt Exp */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.223.8.1.2.10 2011/12/23 23:25:42 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.223.8.1.2.10 2011/12/23 23:25:42 matt Exp");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -137,7 +137,7 @@ char *bootinfo = NULL; /* pointer to bo
int cpuspeed = 30; /* approx # instr per usec. */
int physmem; /* max supported memory, changes to actual */
intptr_t physmem_boardmax; /* {model,SIMM}-specific bound on physmem */
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
/*
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.10 src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.11
--- src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.10 Fri Apr 29 08:26:35 2011
+++ src/sys/arch/sbmips/sbmips/machdep.c Tue Feb 14 01:25:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38.10.10 2011/04/29 08:26:35 matt Exp $ */
+/* machdep.c,v 1.38.10.10 2011/04/29 08:26:35 matt Exp */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.10 2011/04/29 08:26:35 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.38.10.10 2011/04/29 08:26:35 matt Exp");
#include "opt_ddb.h"
#include "opt_ddbparam.h" /* for SYMTAB_SPACE */
@@ -140,7 +140,7 @@ int cfe_present;
struct bootinfo_v1_int bootinfo;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
void configure(void);
void mach_init(long, long, long, long);
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.121.8.6 src/sys/arch/sgimips/sgimips/machdep.c:1.121.8.7
--- src/sys/arch/sgimips/sgimips/machdep.c:1.121.8.6 Wed Dec 29 07:15:48 2010
+++ src/sys/arch/sgimips/sgimips/machdep.c Tue Feb 14 01:25:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.121.8.6 2010/12/29 07:15:48 matt Exp $ */
+/* machdep.c,v 1.121.8.6 2010/12/29 07:15:48 matt Exp */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121.8.6 2010/12/29 07:15:48 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.121.8.6 2010/12/29 07:15:48 matt Exp");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -167,7 +167,7 @@ static const struct ipl_sr_map sgi_ip3x_
#endif /* defined(MIPS3) */
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
-int mem_cluster_cnt;
+u_int mem_cluster_cnt;
#if defined(INDY_R4600_CACHE)
extern void ip22_sdcache_disable(void);
