summaryrefslogtreecommitdiff
path: root/sys/arch/mips64
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2011-05-30 22:25:25 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2011-05-30 22:25:25 +0000
commit4ed4f8dde5fa32c869d6204b0110b4b40f3e5a2e (patch)
tree64c44ccc81ef23bb074f8cb14168a349bf4cfd8c /sys/arch/mips64
parent973b968f1e5f9aebd5ffdbba3ea1a2c40be6e98e (diff)
Remove the freelist member from vm_physseg
The new world order of pmemrange makes this data completely redundant (being dealt with by the pmemrange constraints instead). Remove all code that messes with the freelist. While touching every caller of uvm_page_physload() anyway, add the flags argument to all callers (all but one is 0 and that one already used PHYSLOAD_DEVICE) and remove the macro magic to allow callers to continue without it. Should shrink the code a bit, as well. matthew@ pointed out some mistakes i'd made. ``freelist death, I like. Ok.' ariane@ `I agree with the general direction, go ahead and i'll fix any fallout shortly'' miod@ (68k 88k and vax i could not check would build)
Diffstat (limited to 'sys/arch/mips64')
-rw-r--r--sys/arch/mips64/include/memconf.h5
-rw-r--r--sys/arch/mips64/include/vmparam.h7
-rw-r--r--sys/arch/mips64/mips64/arcbios.c5
3 files changed, 5 insertions, 12 deletions
diff --git a/sys/arch/mips64/include/memconf.h b/sys/arch/mips64/include/memconf.h
index 9373abfa51b..ed1f4299eab 100644
--- a/sys/arch/mips64/include/memconf.h
+++ b/sys/arch/mips64/include/memconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: memconf.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */
+/* $OpenBSD: memconf.h,v 1.7 2011/05/30 22:25:21 oga Exp $ */
/*
* Copyright (c) 1996 Per Fogelstrom
@@ -35,7 +35,6 @@
struct phys_mem_desc {
uint64_t mem_first_page;
uint64_t mem_last_page;
- unsigned int mem_freelist;
};
#ifdef _KERNEL
@@ -43,7 +42,7 @@ struct phys_mem_desc {
#define MAXMEMSEGS 16
#endif
extern struct phys_mem_desc mem_layout[];
-int memrange_register(uint64_t, uint64_t, uint64_t, unsigned int);
+int memrange_register(uint64_t, uint64_t, uint64_t);
#endif
#endif /* !_MIPS64_MEMCONF_H_ */
diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h
index f62e462e1ba..5589395747c 100644
--- a/sys/arch/mips64/include/vmparam.h
+++ b/sys/arch/mips64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.23 2011/03/23 16:54:36 pirofti Exp $ */
+/* $OpenBSD: vmparam.h,v 1.24 2011/05/30 22:25:21 oga Exp $ */
/* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */
/*
@@ -106,11 +106,6 @@
#define VM_PIE_MIN_ADDR PAGE_SIZE
#define VM_PIE_MAX_ADDR (0x10000000UL)
-#ifndef VM_NFREELIST
-#define VM_NFREELIST 1
-#endif
-#define VM_FREELIST_DEFAULT 0
-
/* virtual sizes (bytes) for various kernel submaps */
#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
diff --git a/sys/arch/mips64/mips64/arcbios.c b/sys/arch/mips64/mips64/arcbios.c
index 94f1e74a134..fbd04a49a31 100644
--- a/sys/arch/mips64/mips64/arcbios.c
+++ b/sys/arch/mips64/mips64/arcbios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arcbios.c,v 1.29 2010/03/03 12:25:09 jsing Exp $ */
+/* $OpenBSD: arcbios.c,v 1.30 2011/05/30 22:25:21 oga Exp $ */
/*-
* Copyright (c) 1996 M. Warner Losh. All rights reserved.
* Copyright (c) 1996-2004 Opsycon AB. All rights reserved.
@@ -365,8 +365,7 @@ bios_configure_memory()
break;
}
if (seg_start < seg_end)
- memrange_register(seg_start, seg_end, 0,
- VM_FREELIST_DEFAULT);
+ memrange_register(seg_start, seg_end, 0);
break;
case ExceptionBlock:
case SystemParameterBlock: