Index: arch/ia64/include/mm/page.h
===================================================================
--- arch/ia64/include/mm/page.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
+++ arch/ia64/include/mm/page.h	(revision 28027679ea2027ae25f3b5e39e798a4fa9809047)
@@ -41,6 +41,4 @@
 /** Bit width of the TLB-locked portion of kernel address space. */
 #define KERNEL_PAGE_WIDTH	28	/* 256M */
-
-#define SET_PTL0_ADDRESS_ARCH(x)	/**< To be removed as situation permits. */
 
 #define PPN_SHIFT			12
Index: arch/sparc64/include/mm/page.h
===================================================================
--- arch/sparc64/include/mm/page.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
+++ arch/sparc64/include/mm/page.h	(revision 28027679ea2027ae25f3b5e39e798a4fa9809047)
@@ -44,6 +44,4 @@
 #define PA2KA(x)	((__address) (x))
 
-#define SET_PTL0_ADDRESS_ARCH(x)	/**< To be removed as situation permits. */
-
 union page_address {
 	__address address;
Index: genarch/include/mm/page_ht.h
===================================================================
--- genarch/include/mm/page_ht.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
+++ genarch/include/mm/page_ht.h	(revision 28027679ea2027ae25f3b5e39e798a4fa9809047)
@@ -31,4 +31,6 @@
  */
 
+#ifdef CONFIG_PAGE_HT
+
 #ifndef __PAGE_HT_H__
 #define __PAGE_HT_H__
@@ -47,7 +49,9 @@
 #define PAGE_HT_ENTRIES		(1<<PAGE_HT_ENTRIES_BITS)
 
-#define PTE_VALID_ARCH(pte)		((pte) != NULL)
-#define PTE_PRESENT_ARCH(pte)		((pte)->p != 0)
-#define PTE_GET_FRAME_ARCH(pte)		((pte)->frame)
+#define PTE_VALID(pte)		((pte) != NULL)
+#define PTE_PRESENT(pte)	((pte)->p != 0)
+#define PTE_GET_FRAME(pte)	((pte)->frame)
+
+#define SET_PTL0_ADDRESS(x)
 
 struct pte {
@@ -72,2 +76,4 @@
 
 #endif
+
+#endif
Index: genarch/include/mm/page_pt.h
===================================================================
--- genarch/include/mm/page_pt.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
+++ genarch/include/mm/page_pt.h	(revision 28027679ea2027ae25f3b5e39e798a4fa9809047)
@@ -32,4 +32,6 @@
  * are supposed to implement *_ARCH macros.
  */
+
+#ifdef CONFIG_PAGE_PT
 
 #ifndef __PAGE_PT_H__
@@ -103,2 +105,4 @@
 
 #endif
+
+#endif
Index: generic/src/mm/as.c
===================================================================
--- generic/src/mm/as.c	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
+++ generic/src/mm/as.c	(revision 28027679ea2027ae25f3b5e39e798a4fa9809047)
@@ -41,4 +41,5 @@
 #include <arch/mm/page.h>
 #include <genarch/mm/page_pt.h>
+#include <genarch/mm/page_ht.h>
 #include <mm/asid.h>
 #include <arch/mm/asid.h>