summaryrefslogtreecommitdiff
path: root/sys/arch/sgi
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-09-21 08:55:21 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-09-21 08:55:21 +0000
commit883953c2b7e324376bf3d17e49d8cabe0d275392 (patch)
tree2a217796ae754ba184bff7477e086294c8f2b153 /sys/arch/sgi
parent7cfd001261058ef40b955deadfe79c31d1a6a401 (diff)
nswbuf is long dead; also silence debug printf unless option DEBUG.
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r--sys/arch/sgi/sgi/machdep.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index af255ce90d0..cb1a15c8d69 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.13 2004/09/21 05:51:15 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.14 2004/09/21 08:55:20 miod Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -109,7 +109,6 @@ int allowaperture = 0;
#define BUFPAGES 0 /* Can be changed in config */
#endif
-int nswbuf = 0;
int nbuf = NBUF;
int bufpages = BUFPAGES;
@@ -164,7 +163,6 @@ mips_init(int argc, int32_t *argv)
int i;
unsigned firstaddr;
caddr_t sd;
- struct tlb tlb;
extern char start[], edata[], end[];
extern char tlb_miss[], e_tlb_miss[];
extern char tlb_miss_tramp[], e_tlb_miss_tramp[];
@@ -368,6 +366,7 @@ mips_init(int argc, int32_t *argv)
tlb_flush(sys_config.cpu[0].tlbsize);
tlb_set_wired(sys_config.cpu[0].tlbwired);
+#if 0
/* XXX Save the following as an example on how to optimize I/O mapping */
/*
@@ -377,6 +376,8 @@ mips_init(int argc, int32_t *argv)
if (sys_config.system_type == MOMENTUM_CP7000G ||
sys_config.system_type == MOMENTUM_CP7000 ||
sys_config.system_type == GALILEO_EV64240) {
+ struct tlb tlb;
+
tlb.tlb_mask = PG_SIZE_16M;
#if defined(LP64)
tlb.tlb_hi = vad_to_vpn(0xfffffffffc000000) | 1;
@@ -397,6 +398,7 @@ mips_init(int argc, int32_t *argv)
}
}
/* XXX */
+#endif
/*
* Get a console, very early but after initial mapping setup.
@@ -509,13 +511,6 @@ allocsys(caddr_t v)
bufpages = nbuf * MAXBSIZE / PAGE_SIZE;
}
- if (nswbuf == 0) {
- nswbuf = (nbuf / 2) &~ 1; /* even */
- if (nswbuf > 256) {
- nswbuf = 256;
- }
- }
-
valloc(buf, struct buf, nbuf);
/*
@@ -1008,7 +1003,9 @@ rm7k_perfcntr(cmd, arg1, arg2, arg3)
result = EINVAL;
break;
}
+#ifdef DEBUG
printf("perfcnt select %x, proc %p\n", arg1, p);
+#endif
p->p_md.md_pc_count = 0;
p->p_md.md_pc_spill = 0;
p->p_md.md_pc_ctrl = arg1;
@@ -1022,7 +1019,9 @@ printf("perfcnt select %x, proc %p\n", arg1, p);
break;
default:
+#ifdef DEBUG
printf("perfcnt error %d\n", cmd);
+#endif
result = -1;
break;
}