diff --git a/[refs] b/[refs]
index e5673374c644..459f0443a9a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70dfa3f8756afa106a468e81649bf0c1d7dbf99e
+refs/heads/master: a8fa9ba623122a51efe6c9ef8fe7412c91582d48
diff --git a/trunk/include/asm-arm/pgtable.h b/trunk/include/asm-arm/pgtable.h
index d2e8171d1d4e..5e0182485d8c 100644
--- a/trunk/include/asm-arm/pgtable.h
+++ b/trunk/include/asm-arm/pgtable.h
@@ -249,7 +249,7 @@ extern struct page *empty_zero_page;
 #define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext)
 
 #define set_pte_at(mm,addr,ptep,pteval) do { \
-	set_pte_ext(ptep, pteval, (addr) >= PAGE_OFFSET ? 0 : PTE_EXT_NG); \
+	set_pte_ext(ptep, pteval, (addr) >= TASK_SIZE ? 0 : PTE_EXT_NG); \
  } while (0)
 
 /*