old style mtrr interface went away

2 files changed, 2 insertions, 148 deletions

diff --git a/share/man/man4/man4.amd64/Makefile b/share/man/man4/man4.amd64/Makefile
index 87b43b4c67a..d902c4e1658 100644
--- a/share/man/man4/man4.amd64/Makefile
+++ b/share/man/man4/man4.amd64/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.12 2009/05/07 20:06:30 ariane Exp $
+#	$OpenBSD: Makefile,v 1.13 2011/03/18 05:38:20 deraadt Exp $
 
 MAN=	amdpcib.4 apm.4 autoconf.4 bios.4 cpu.4 intro.4 ioapic.4 \
-	mem.4 mpbios.4 mtrr.4 nvram.4 pctr.4
+	mem.4 mpbios.4 nvram.4 pctr.4
 
 MLINKS+= mem.4 kmem.4
 MANSUBDIR=amd64
diff --git a/share/man/man4/man4.amd64/mtrr.4 b/share/man/man4/man4.amd64/mtrr.4
deleted file mode 100644
index 04fd1777d64..00000000000
--- a/share/man/man4/man4.amd64/mtrr.4
+++ /dev/null
@@ -1,146 +0,0 @@
-.\"	$OpenBSD: mtrr.4,v 1.2 2008/06/16 15:21:10 jmc Exp $
-.\"
-.\" MTRR driver for OpenBSD.
-.\" Copyright 1999 Matthieu Herrb <matthieu@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.Dd $Mdocdate: June 16 2008 $
-.Dt MTRR 4 amd64
-.Os
-.Sh NAME
-.Nm mtrr
-.Nd driver for CPU memory range attributes
-.Sh SYNOPSIS
-.Cd "pseudo-device mtrr 1"
-.Sh DESCRIPTION
-The
-.Nm
-device provides access to the memory range attributes supported by the
-MTRRs on AMD64 compatible CPUs.
-.Ss IOCTL INTERFACE
-Several architectures allow attributes to be associated with ranges of physical
-memory.
-These attributes can be manipulated via
-.Fn ioctl
-calls performed on
-.Pa /dev/mem
-or
-.Pa /dev/xf86 .
-Declarations and data types are to be found in
-.Aq Pa sys/memrange.h .
-.Pp
-The specific attributes, and number of programmable ranges may vary between
-architectures.
-The full set of supported attributes is:
-.Bl -tag -width MDF_WRITECOMBINE
-.It Dv MDF_UNCACHEABLE
-The region is not cached.
-.It Dv MDF_WRITECOMBINE
-Writes to the region may be combined or performed out of order.
-.It Dv MDF_WRITETHROUGH
-Writes to the region are committed synchronously.
-.It Dv MDF_WRITEBACK
-Writes to the region are committed asynchronously.
-.It Dv MDF_WRITEPROTECT
-The region cannot be written to.
-.El
-.Pp
-Memory ranges are described by
-.Bd -literal -offset xxxx
-struct mem_range_desc {
-	u_int64_t	mr_base;	/\(** physical base address \(**/
-	u_int64_t	mr_len;		/\(** physical length of region \(**/
-	int		mr_flags;	/\(** attributes of region \(**/
-	char		mr_owner[8];
-};
-.Ed
-.Pp
-In addition to the region attributes listed above, the following flags
-may also be set in the
-.Fa mr_flags
-field:
-.Bl -tag -width MDF_FIXACTIVE
-.It Dv MDF_FIXBASE
-The region's base address cannot be changed.
-.It Dv MDF_FIXLEN
-The region's length cannot be changed.
-.It Dv MDF_FIRMWARE
-The region is believed to have been established by the system firmware.
-.It Dv MDF_ACTIVE
-The region is currently active.
-.It Dv MDF_BOGUS
-We believe the region to be invalid or otherwise erroneous.
-.It Dv MDF_FIXACTIVE
-The region cannot be disabled.
-.It Dv MDF_BUSY
-The region is currently owned by another process and may not be
-altered.
-.El
-.Pp
-Operations are performed using
-.Bd -literal -offset xxxx
-struct mem_range_op {
-	struct mem_range_desc	*mo_desc;
-	int			mo_arg[2];
-};
-.Ed
-.Pp
-The
-.Fa MEMRANGE_GET
-ioctl is used to retrieve current memory range attributes.
-If
-.Fa mo_arg[0]
-is set to 0, it will be updated with the total number of memory range
-descriptors.
-If greater than 0, the array at
-.Fa mo_desc
-will be filled with a corresponding number of descriptor structures,
-or the maximum, whichever is less.
-.Pp
-The
-.Fa MEMRANGE_SET
-ioctl is used to add, alter and remove memory range attributes.
-A range with the
-.Dv MDF_FIXACTIVE
-flag may not be removed; a range with the
-.Dv MDF_BUSY
-flag may not be removed or updated.
-.Pp
-.Fa mo_arg[0]
-should be set to MEMRANGE_SET_UPDATE to update an existing
-or establish a new range, or to MEMRANGE_SET_REMOVE to remove a range.
-.Sh RETURN VALUES
-.Bl -tag -width Er
-.It Bq Er EOPNOTSUPP
-Memory range operations are not supported on this architecture.
-.It Bq Er ENXIO
-No memory range descriptors are available (e.g., firmware has not enabled
-any).
-.It Bq Er EINVAL
-The memory range supplied as an argument is invalid or overlaps another
-range in a fashion not supported by this architecture.
-.It Bq Er EBUSY
-An attempt to remove or update a range failed because the range is busy.
-.It Bq Er ENOSPC
-An attempt to create a new range failed due to a shortage of hardware
-resources (e.g., descriptor slots).
-.It Bq Er ENOENT
-An attempt to remove a range failed because no range matches the descriptor
-base/length supplied.
-.It Bq Er EPERM
-An attempt to remove a range failed because the range is permanently
-enabled.
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr mem 4 ,
-.Xr pctr 4 ,
-.Xr xf86 4 ,
-.Xr memconfig 8
-.Sh HISTORY
-.Nm
-support was originally included in
-.Fx 3.3 .