diff --git a/[refs] b/[refs]
index f83dd84158e3..9f339cc906f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c4d33ac5ca7920f0e0f6b25bdfd3fa479fd973
+refs/heads/master: 2f099a280e92c259598d8ed8da82c7ec2dd49845
diff --git a/trunk/arch/openrisc/include/asm/page.h b/trunk/arch/openrisc/include/asm/page.h
index b041b344b229..c4ffaee5f940 100644
--- a/trunk/arch/openrisc/include/asm/page.h
+++ b/trunk/arch/openrisc/include/asm/page.h
@@ -94,8 +94,7 @@ extern unsigned long memory_end;
 
 #define pfn_valid(pfn)          ((pfn) < max_mapnr)
 
-#define virt_addr_valid(kaddr)  (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
-				((void *)(kaddr) < (void *)memory_end))
+#define virt_addr_valid(kaddr)	(pfn_valid(virt_to_pfn(kaddr)))
 
 #endif /* __ASSEMBLY__ */