|
@@ -138,16 +138,14 @@ typedef struct { unsigned long pgprot; } pgprot_t;
|
|
|
|
|
|
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
|
|
|
|
|
|
-#ifndef CONFIG_SPARSEMEM
|
|
|
-#ifndef CONFIG_NEED_MULTIPLE_NODES
|
|
|
-#define pfn_valid(pfn) ((pfn) < max_mapnr)
|
|
|
-#endif
|
|
|
-#endif
|
|
|
-
|
|
|
#ifdef CONFIG_FLATMEM
|
|
|
|
|
|
#define pfn_valid(pfn) ((pfn) < max_mapnr)
|
|
|
|
|
|
+#elif defined(CONFIG_SPARSEMEM)
|
|
|
+
|
|
|
+/* pfn_valid is defined in linux/mmzone.h */
|
|
|
+
|
|
|
#elif defined(CONFIG_NEED_MULTIPLE_NODES)
|
|
|
|
|
|
#define pfn_valid(pfn) \
|
|
@@ -159,8 +157,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
|
|
|
: 0); \
|
|
|
})
|
|
|
|
|
|
-#else
|
|
|
-#error Provide a definition of pfn_valid
|
|
|
#endif
|
|
|
|
|
|
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
|