Thu Jun 10 05:45:50 2010 UTC ()
Move "space on 256MB sbmips" comment into alternate of #ifdef where it applies.
Matthew Green noticed this one, thanks.


(cliff)
diff -r1.179.16.25 -r1.179.16.26 src/sys/arch/mips/mips/pmap.c
cvs diff -r1.179.16.25 -r1.179.16.26 src/sys/arch/mips/mips/Attic/pmap.c (expand / switch to unified diff)

--- src/sys/arch/mips/mips/Attic/pmap.c 2010/06/10 00:37:58 1.179.16.25
+++ src/sys/arch/mips/mips/Attic/pmap.c 2010/06/10 05:45:50 1.179.16.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pmap.c,v 1.179.16.25 2010/06/10 00:37:58 cliff Exp $ */ 1/* $NetBSD: pmap.c,v 1.179.16.26 2010/06/10 05:45:50 cliff Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center and by Chris G. Demetriou. 9 * NASA Ames Research Center and by Chris G. Demetriou.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -57,27 +57,27 @@ @@ -57,27 +57,27 @@
57 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 57 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
58 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 58 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
59 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 59 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
60 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 60 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
61 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 61 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
62 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 62 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
63 * SUCH DAMAGE. 63 * SUCH DAMAGE.
64 * 64 *
65 * @(#)pmap.c 8.4 (Berkeley) 1/26/94 65 * @(#)pmap.c 8.4 (Berkeley) 1/26/94
66 */ 66 */
67 67
68#include <sys/cdefs.h> 68#include <sys/cdefs.h>
69 69
70__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179.16.25 2010/06/10 00:37:58 cliff Exp $"); 70__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179.16.26 2010/06/10 05:45:50 cliff Exp $");
71 71
72/* 72/*
73 * Manages physical address maps. 73 * Manages physical address maps.
74 * 74 *
75 * In addition to hardware address maps, this 75 * In addition to hardware address maps, this
76 * module is called upon to provide software-use-only 76 * module is called upon to provide software-use-only
77 * maps which may or may not be stored in the same 77 * maps which may or may not be stored in the same
78 * form as hardware maps. These pseudo-maps are 78 * form as hardware maps. These pseudo-maps are
79 * used to store intermediate results from copy 79 * used to store intermediate results from copy
80 * operations to and from address spaces. 80 * operations to and from address spaces.
81 * 81 *
82 * Since the information managed by this module is 82 * Since the information managed by this module is
83 * also stored by the logical address mapping module, 83 * also stored by the logical address mapping module,
@@ -507,30 +507,30 @@ pmap_bootstrap(void) @@ -507,30 +507,30 @@ pmap_bootstrap(void)
507 bufsz + 16 * NCARGS + pager_map_size) / NBPG + 507 bufsz + 16 * NCARGS + pager_map_size) / NBPG +
508 (maxproc * UPAGES) + nkmempages; 508 (maxproc * UPAGES) + nkmempages;
509 509
510#ifdef SYSVSHM 510#ifdef SYSVSHM
511 Sysmapsize += shminfo.shmall; 511 Sysmapsize += shminfo.shmall;
512#endif 512#endif
513#ifdef KSEG2IOBUFSIZE 513#ifdef KSEG2IOBUFSIZE
514 Sysmapsize += (KSEG2IOBUFSIZE >> PGSHIFT); 514 Sysmapsize += (KSEG2IOBUFSIZE >> PGSHIFT);
515#endif 515#endif
516#ifdef PMAP_POOLPAGE_DEBUG 516#ifdef PMAP_POOLPAGE_DEBUG
517 poolpage.size = nkmempages + MCLBYTES * nmbclusters; 517 poolpage.size = nkmempages + MCLBYTES * nmbclusters;
518 Sysmapsize += poolpage.size; 518 Sysmapsize += poolpage.size;
519#endif 519#endif
520 /* XXX: else runs out of space on 256MB sbmips!! */ 
521#ifdef _LP64 520#ifdef _LP64
522 Sysmapsize += physmem; 521 Sysmapsize += physmem;
523#else 522#else
 523 /* XXX: else runs out of space on 256MB sbmips!! */
524 Sysmapsize += 20000; 524 Sysmapsize += 20000;
525#endif 525#endif
526 526
527 /* 527 /*
528 * Initialize `FYI' variables. Note we're relying on 528 * Initialize `FYI' variables. Note we're relying on
529 * the fact that BSEARCH sorts the vm_physmem[] array 529 * the fact that BSEARCH sorts the vm_physmem[] array
530 * for us. Must do this before uvm_pageboot_alloc() 530 * for us. Must do this before uvm_pageboot_alloc()
531 * can be called. 531 * can be called.
532 */ 532 */
533 mips_avail_start = vm_physmem[0].start << PGSHIFT; 533 mips_avail_start = vm_physmem[0].start << PGSHIFT;
534 mips_avail_end = vm_physmem[vm_nphysseg - 1].end << PGSHIFT; 534 mips_avail_end = vm_physmem[vm_nphysseg - 1].end << PGSHIFT;
535 mips_virtual_end = VM_MIN_KERNEL_ADDRESS + (vaddr_t)Sysmapsize * NBPG; 535 mips_virtual_end = VM_MIN_KERNEL_ADDRESS + (vaddr_t)Sysmapsize * NBPG;
536#ifndef _LP64 536#ifndef _LP64