|
@@ -214,7 +214,7 @@ static inline void *phys_to_virt(phys_addr_t x)
|
|
|
|
|
|
#ifndef CONFIG_SPARSEMEM_VMEMMAP
|
|
|
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
|
|
|
-#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
|
|
|
+#define _virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
|
|
|
#else
|
|
|
#define __virt_to_pgoff(kaddr) (((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))
|
|
|
#define __page_to_voff(kaddr) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
|
|
@@ -222,11 +222,15 @@ static inline void *phys_to_virt(phys_addr_t x)
|
|
|
#define page_to_virt(page) ((void *)((__page_to_voff(page)) | PAGE_OFFSET))
|
|
|
#define virt_to_page(vaddr) ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))
|
|
|
|
|
|
-#define virt_addr_valid(kaddr) pfn_valid((((u64)(kaddr) & ~PAGE_OFFSET) \
|
|
|
+#define _virt_addr_valid(kaddr) pfn_valid((((u64)(kaddr) & ~PAGE_OFFSET) \
|
|
|
+ PHYS_OFFSET) >> PAGE_SHIFT)
|
|
|
#endif
|
|
|
#endif
|
|
|
|
|
|
+#define _virt_addr_is_linear(kaddr) (((u64)(kaddr)) >= PAGE_OFFSET)
|
|
|
+#define virt_addr_valid(kaddr) (_virt_addr_is_linear(kaddr) && \
|
|
|
+ _virt_addr_valid(kaddr))
|
|
|
+
|
|
|
#include <asm-generic/memory_model.h>
|
|
|
|
|
|
#endif
|