diff --git a/[refs] b/[refs]
index fa750a89cb5e..5ef700d600c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34574dd10b6d0697b86703388d6d6af9cbf4bb48
+refs/heads/master: 6fde836b54f1f0ca3d3c8b7aaf44165a08fe0f9f
diff --git a/trunk/include/asm-frv/pgtable.h b/trunk/include/asm-frv/pgtable.h
index e16fdb1f4f4f..33233011b1c1 100644
--- a/trunk/include/asm-frv/pgtable.h
+++ b/trunk/include/asm-frv/pgtable.h
@@ -71,10 +71,8 @@ static inline int pte_file(pte_t pte) { return 0; }
 #define swapper_pg_dir		((pgd_t *) NULL)
 
 #define pgtable_cache_init()		do {} while (0)
-#define arch_enter_lazy_mmu_mode()	do {} while (0)
-#define arch_leave_lazy_mmu_mode()	do {} while (0)
-#define arch_enter_lazy_cpu_mode()	do {} while (0)
-#define arch_leave_lazy_cpu_mode()	do {} while (0)
+
+#include <asm-generic/pgtable.h>
 
 #else /* !CONFIG_MMU */
 /*****************************************************************************/