From 592d1ee8b3f6e5c98b9297de55b3603580f375f6 Mon Sep 17 00:00:00 2001
From: ae <ae@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 21 Aug 2017 10:07:12 +0000
Subject: [PATCH] MFC r284152:   Add makefile to build geom_map kld. Document
 some GEOM_* options   in NOTES and geom(4).

PR:		197766
Approved by:	re (kib)


git-svn-id: svn://svn.freebsd.org/base/stable/10@322744 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 share/man/man4/geom.4              | 5 ++++-
 share/man/man4/geom_map.4          | 4 ++--
 sys/conf/NOTES                     | 2 ++
 sys/conf/options                   | 1 +
 sys/modules/geom/geom_map/Makefile | 8 ++++++++
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 sys/modules/geom/geom_map/Makefile

diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index 3cfc28383..b7b0c2257 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 10, 2013
+.Dd June 8, 2015
 .Dt GEOM 4
 .Os
 .Sh NAME
@@ -52,12 +52,14 @@
 .Cd options GEOM_JOURNAL
 .Cd options GEOM_LABEL
 .Cd options GEOM_LINUX_LVM
+.Cd options GEOM_MAP
 .Cd options GEOM_MBR
 .Cd options GEOM_MIRROR
 .Cd options GEOM_MULTIPATH
 .Cd options GEOM_NOP
 .Cd options GEOM_PART_APM
 .Cd options GEOM_PART_BSD
+.Cd options GEOM_PART_BSD64
 .Cd options GEOM_PART_EBR
 .Cd options GEOM_PART_EBR_COMPAT
 .Cd options GEOM_PART_GPT
@@ -71,6 +73,7 @@
 .Cd options GEOM_SHSEC
 .Cd options GEOM_STRIPE
 .Cd options GEOM_SUNLABEL
+.Cd options GEOM_UNCOMPRESS
 .Cd options GEOM_UZIP
 .Cd options GEOM_VIRSTOR
 .Cd options GEOM_VOL
diff --git a/share/man/man4/geom_map.4 b/share/man/man4/geom_map.4
index 6af91be5d..2c065ca2b 100644
--- a/share/man/man4/geom_map.4
+++ b/share/man/man4/geom_map.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 17, 2011
+.Dd June 8, 2015
 .Dt GEOM_MAP 4
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@ To compile this driver into the kernel,
 place the following line in your
 kernel configuration file:
 .Bd -ragged -offset indent
-.Cd "device geom_map"
+.Cd "options geom_map"
 .Ed
 .Sh DESCRIPTION
 The
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 19169848b..ec9693256 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -156,6 +156,7 @@ options 	GEOM_GATE		# Userland services.
 options 	GEOM_JOURNAL		# Journaling.
 options 	GEOM_LABEL		# Providers labelization.
 options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
+options 	GEOM_MAP		# Map based partitioning
 options 	GEOM_MBR		# DOS/MBR partitioning
 options 	GEOM_MIRROR		# Disk mirroring.
 options 	GEOM_MULTIPATH		# Disk multipath
@@ -176,6 +177,7 @@ options 	GEOM_RAID3		# RAID3 functionality.
 options 	GEOM_SHSEC		# Shared secret.
 options 	GEOM_STRIPE		# Disk striping.
 options 	GEOM_SUNLABEL		# Sun/Solaris partitioning
+options 	GEOM_UNCOMPRESS		# Read-only compressed disks (lzma, zip)
 options 	GEOM_UZIP		# Read-only compressed disks
 options 	GEOM_VINUM		# Vinum logical volume manager
 options 	GEOM_VIRSTOR		# Virtual storage.
diff --git a/sys/conf/options b/sys/conf/options
index 389226852..a21de0da7 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -104,6 +104,7 @@ GEOM_GATE	opt_geom.h
 GEOM_JOURNAL	opt_geom.h
 GEOM_LABEL	opt_geom.h
 GEOM_LINUX_LVM	opt_geom.h
+GEOM_MAP	opt_geom.h
 GEOM_MBR	opt_geom.h
 GEOM_MIRROR	opt_geom.h
 GEOM_MOUNTVER	opt_geom.h
diff --git a/sys/modules/geom/geom_map/Makefile b/sys/modules/geom/geom_map/Makefile
new file mode 100644
index 000000000..6b26ba947
--- /dev/null
+++ b/sys/modules/geom/geom_map/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom
+
+KMOD=	geom_map
+SRCS=	geom_map.c bus_if.h device_if.h
+
+.include <bsd.kmod.mk>
-- 
2.45.0