diff --git a/[refs] b/[refs]
index 44b5dee42f5e..982852d8c06e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d455a3696c72283923e6870e9e4fe1daa861d7cd
+refs/heads/master: 561bbe3235da614562fb26bb14042af684971a2d
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index ac6e694c3b61..6ea204cc751e 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1612,11 +1612,6 @@ static void unmap_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
 	validate_mm(mm);
 }
 
-#ifndef FIRST_USER_ADDRESS	/* temporary hack */
-#define THIS_IS_ARM		FIRST_USER_PGD_NR
-#define FIRST_USER_ADDRESS	(THIS_IS_ARM * PAGE_SIZE)
-#endif
-
 /*
  * Get rid of page table information in the indicated region.
  *