From 2f099a280e92c259598d8ed8da82c7ec2dd49845 Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Fri, 2 Mar 2012 07:56:09 +0100 Subject: openrisc: fix virt_addr_valid virt_addr_valid() shouldn't be comparing the address to memory_end which is a phys_addr_t. Change this to do like other arches and check that the address falls within a valid page frame. Signed-off-by: Jonas Bonn --- arch/openrisc/include/asm/page.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/openrisc/include/asm/page.h') diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h index b041b344b22..c4ffaee5f94 100644 --- a/arch/openrisc/include/asm/page.h +++ b/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__ */ -- cgit v1.2.3-70-g09d2 From fa8d9d74c360726fe743b08af00ee3d0e0eb8bc1 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Fri, 2 Mar 2012 16:41:02 +0100 Subject: OpenRISC: Remove memory_start/end prototypes OpenRISC does not have global memory_start and memory_end symbols. The prototypes are in vain. Signed-off-by: Richard Weinberger Signed-off-by: Jonas Bonn --- arch/openrisc/include/asm/page.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/openrisc/include/asm/page.h') diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h index c4ffaee5f94..108906f991d 100644 --- a/arch/openrisc/include/asm/page.h +++ b/arch/openrisc/include/asm/page.h @@ -71,9 +71,6 @@ typedef struct page *pgtable_t; #define __pgd(x) ((pgd_t) { (x) }) #define __pgprot(x) ((pgprot_t) { (x) }) -extern unsigned long memory_start; -extern unsigned long memory_end; - #endif /* !__ASSEMBLY__ */ -- cgit v1.2.3-70-g09d2