svn commit: r277052 - head/sys/amd64/include

[Konstantin Belousov]

Author: kib
Date: Mon Jan 12 07:50:55 2015
New Revision: 277052
URL: https://svnweb.freebsd.org/changeset/base/277052

Log:
  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

Modified:
  head/sys/amd64/include/vmparam.h

Modified: head/sys/amd64/include/vmparam.h
==============================================================================
--- head/sys/amd64/include/vmparam.h	Mon Jan 12 07:48:22 2015	(r277051)
+++ head/sys/amd64/include/vmparam.h	Mon Jan 12 07:50:55 2015	(r277052)
@@ -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.