Index: genarch/src/mm/page_ht.c
===================================================================
--- genarch/src/mm/page_ht.c	(revision 9ad03fec78002f6c5bc6a172560ca90686f6e17d)
+++ genarch/src/mm/page_ht.c	(revision b22e1dbc4ba028963e375a8198ec9ead24c80bf9)
@@ -42,4 +42,5 @@
 #include <memstr.h>
 #include <adt/hash_table.h>
+#include <align.h>
 
 static index_t hash(__native key[]);
@@ -165,5 +166,5 @@
 {
 	pte_t *t;
-	__native key[2] = { (__address) as, page };
+	__native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
 	
 	spinlock_lock(&page_ht_lock);
@@ -203,5 +204,5 @@
 void ht_mapping_remove(as_t *as, __address page)
 {
-	__native key[2] = { (__address) as, page };
+	__native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
 	
 	spinlock_lock(&page_ht_lock);
@@ -232,5 +233,5 @@
 	link_t *hlp;
 	pte_t *t = NULL;
-	__native key[2] = { (__address) as, page };
+	__native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
 	
 	spinlock_lock(&page_ht_lock);