Index: generic/include/mm/as.h
===================================================================
--- generic/include/mm/as.h	(revision a9e8b391eb50bc107c79551596bd8b68710ead90)
+++ generic/include/mm/as.h	(revision c6c59ccd6961621330425664fc6841acad7bd8f5)
@@ -64,4 +64,8 @@
 #define AS_AREA_ATTR_PARTIAL	1	/* Not fully initialized area. */
 
+#define AS_PF_FAULT		0	/**< The page fault was not resolved by asp_page_fault(). */
+#define AS_PF_OK		1	/**< The page fault was resolved by as_page_fault(). */
+#define AS_PF_DEFER		2	/**< The page fault was caused by memcpy_from_uspace(). */
+
 /** Address space area structure.
  *
@@ -122,5 +126,5 @@
 int as_area_send(task_id_t dst_id, __address base);
 extern void as_set_mapping(as_t *as, __address page, __address frame);
-extern int as_page_fault(__address page);
+extern int as_page_fault(__address page, istate_t *istate);
 extern void as_switch(as_t *old, as_t *new);
 extern void as_free(as_t *as);
Index: generic/include/mm/page.h
===================================================================
--- generic/include/mm/page.h	(revision a9e8b391eb50bc107c79551596bd8b68710ead90)
+++ generic/include/mm/page.h	(revision c6c59ccd6961621330425664fc6841acad7bd8f5)
@@ -61,15 +61,4 @@
 #define PAGE_GLOBAL		(1<<PAGE_GLOBAL_SHIFT)
 
-/* TODO - check that userspace is OK, platform specific functions etc */
-static inline void copy_to_uspace(void *dst, void *src, count_t cnt)
-{
-	memcpy(dst, src, cnt);
-} 
-
-static inline void copy_from_uspace(void *dst, void *src, count_t cnt)
-{
-	memcpy(dst, src, cnt);
-}
-
 /** Operations to manipulate page mappings. */
 struct page_mapping_operations {