From b5243bd4f701bd43139d5ba948538d73d5df490f Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 12 Jan 2015 07:50:55 +0000
Subject: [PATCH] Revert r276600: PHYS_TO_DMAP_RAW() and DMAP_TO_PHYS_RAW() are
 no longer used, remove them.

Reviewed by:	alc
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
---
 sys/amd64/include/vmparam.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index e90028e6a6c..a92dd4eb26c 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -183,8 +183,6 @@
 #define	VM_MAX_ADDRESS		UPT_MAX_ADDRESS
 #define	VM_MIN_ADDRESS		(0)
 
-#define	PHYS_TO_DMAP_RAW(x)	((x) | DMAP_MIN_ADDRESS)
-#define	DMAP_TO_PHYS_RAW(x)	((x) & ~DMAP_MIN_ADDRESS)
 /*
  * XXX Allowing dmaplimit == 0 is a temporary workaround for vt(4) efifb's
  * early use of PHYS_TO_DMAP before the mapping is actually setup. This works
@@ -195,14 +193,14 @@
 	KASSERT(dmaplimit == 0 || (x) < dmaplimit,			\
 	    ("physical address %#jx not covered by the DMAP",		\
 	    (uintmax_t)x));						\
-	PHYS_TO_DMAP_RAW(x); })
+	(x) | DMAP_MIN_ADDRESS; })
 
 #define	DMAP_TO_PHYS(x)	({						\
 	KASSERT((x) < (DMAP_MIN_ADDRESS + dmaplimit) &&			\
 	    (x) >= DMAP_MIN_ADDRESS,					\
 	    ("virtual address %#jx not covered by the DMAP",		\
 	    (uintmax_t)x));						\
-	DMAP_TO_PHYS_RAW(x); })
+	(x) & ~DMAP_MIN_ADDRESS; })
 
 /*
  * How many physical pages per kmem arena virtual page.