Index: genarch/include/mm/as_ht.h
===================================================================
--- genarch/include/mm/as_ht.h	(revision 4e147a6b5728fbdb666c31b993900fd3d6681518)
+++ genarch/include/mm/as_ht.h	(revision 4e147a6b5728fbdb666c31b993900fd3d6681518)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __AS_HT_H__
+#define __AS_HT_H__
+
+#include <mm/as.h>
+
+extern as_operations_t as_ht_operations;
+
+#endif
Index: genarch/include/mm/as_pt.h
===================================================================
--- genarch/include/mm/as_pt.h	(revision 4e147a6b5728fbdb666c31b993900fd3d6681518)
+++ genarch/include/mm/as_pt.h	(revision 4e147a6b5728fbdb666c31b993900fd3d6681518)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __AS_PT_H__
+#define __AS_PT_H__
+
+#include <mm/as.h>
+
+extern as_operations_t as_pt_operations;
+
+#endif
Index: genarch/include/mm/page_ht.h
===================================================================
--- genarch/include/mm/page_ht.h	(revision fc1e4f6fda536ab9535536af72ca0eb08473cd3f)
+++ genarch/include/mm/page_ht.h	(revision 4e147a6b5728fbdb666c31b993900fd3d6681518)
@@ -39,6 +39,8 @@
 #include <typedefs.h>
 
-/** Number of slots in page hash table. */
-#define HT_ENTRIES			HT_ENTRIES_ARCH
+/** Page hash table size. */
+#define HT_WIDTH			HT_WIDTH_ARCH
+#define HT_SIZE				(1<<HT_WIDTH)
+#define HT_ENTRIES			(HT_SIZE/sizeof(pte_t))
 
 /** Hash function.
@@ -100,5 +102,4 @@
 #define HT_SET_RECORD(t, page, asid, frame, flags)	HT_SET_RECORD_ARCH(t, page, asid, frame, flags)
 
-
 extern page_operations_t page_ht_operations;
 extern spinlock_t page_ht_lock;
Index: genarch/include/mm/page_pt.h
===================================================================
--- genarch/include/mm/page_pt.h	(revision fc1e4f6fda536ab9535536af72ca0eb08473cd3f)
+++ genarch/include/mm/page_pt.h	(revision 4e147a6b5728fbdb666c31b993900fd3d6681518)
@@ -88,6 +88,6 @@
 extern page_operations_t page_pt_operations;
 
-extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags, __address root);
-extern pte_t *page_mapping_find_pt(as_t *as, __address page, __address root);
+extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags);
+extern pte_t *page_mapping_find_pt(as_t *as, __address page);
 
 #endif