PERFORCE change 140173 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=140173

Change 140173 by marcel at marcel_cluster on 2008/04/17 17:37:45

	Cleanup. While here, bump LVM page size to 2MB so that
	we have 1GB of LVM with a single EFI page for the page
	table (i.e. enough to pre-load a CD image).

Affected files ...

.. //depot/projects/ia64/sys/ia64/include/vmparam.h#23 edit

Differences ...

==== //depot/projects/ia64/sys/ia64/include/vmparam.h#23 (text+ko) ====

@@ -1,7 +1,3 @@
-/* $FreeBSD: src/sys/ia64/include/vmparam.h,v 1.18 2007/12/27 16:45:39 alc Exp $ */
-/* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
-#ifndef	_MACHINE_VMPARAM_H
-#define	_MACHINE_VMPARAM_H
 /*-
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -38,11 +34,13 @@
  * from: Utah $Hdr: vmparam.h 1.16 91/01/18$
  *
  *	@(#)vmparam.h	8.2 (Berkeley) 4/22/94
+ *
+ * $FreeBSD: src/sys/ia64/include/vmparam.h,v 1.18 2007/12/27 16:45:39 alc Exp $
  */
 
-/*
- * Machine dependent constants for ia64.
- */
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
+
 /*
  * USRSTACK is the top (end) of the user stack.  Immediately above the user
  * stack resides the syscall gateway page.
@@ -72,18 +70,6 @@
 #endif
 
 /*
- * Boundary at which to place first MAPMEM segment if not explicitly
- * specified.  Should be a power of two.  This allows some slop for
- * the data segment to grow underneath the first mapped segment.
- */
-#define MMSEG		0x200000
-
-/*
- * The size of the clock loop.
- */
-#define	LOOPPAGES	(maxfree - firstfree)
-
-/*
  * The time for a process to be blocked before being very swappable.
  * This is a number of seconds which the system takes as being a non-trivial
  * amount of real time.  You probably shouldn't change this;
@@ -95,17 +81,6 @@
 #define	MAXSLP 		20
 
 /*
- * A swapped in process is given a small amount of core without being bothered
- * by the page replacement algorithm.  Basically this says that if you are
- * swapped in you deserve some resources.  We protect the last SAFERSS
- * pages against paging and will just swap you out rather than paging you.
- * Note that each process has at least UPAGES pages which are not
- * paged anyways, in addition to SAFERSS.
- */
-#define	SAFERSS		10		/* nominal ``small'' resident set size
-					   protected against replacement */
-
-/*
  * We need region 7 virtual addresses for pagetables.
  */
 #define UMA_MD_SMALL_ALLOC
@@ -177,9 +152,13 @@
  * Parameters for loader virtual memory (LVM). The kernel, its modules and
  * metadata are loaded in the LVM by the loader. The kernel is given the PA
  * and size of the page table that provides the mapping of the LVM.
+ * With EFI pages 4KB in size and pointers 8 bytes wide, we have at least
+ * 512 entries in the page table. With a 2MB page size this gives us 1GB of
+ * LVM. Enough to pre-load a 700MB CD image. More LVM can be created by
+ * using multiple EFI pages for the page table.
  */
 #define	IA64_LVM_BASE		0xbffc000000000000
-#define	IA64_LVM_PAGE_SHIFT	20		/* 1MB */
+#define	IA64_LVM_PAGE_SHIFT	21		/* 2MB */
 #define	IA64_LVM_PAGE_SIZE	(1U<<IA64_LVM_PAGE_SHIFT)
 #define	IA64_LVM_PAGE_MASK	(IA64_LVM_PAGE_SIZE - 1)
 
@@ -217,4 +196,4 @@
 #define	VM_INITIAL_PAGEIN	16
 #endif
 
-#endif	/* !_MACHINE_VMPARAM_H */
+#endif	/* !_MACHINE_VMPARAM_H_ */