projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] knfsd: nfsd4: actually use all the pieces to implement referrals
[powerpc.git]
/
include
/
asm-frv
/
page.h
diff --git
a/include/asm-frv/page.h
b/include/asm-frv/page.h
index
4feba56
..
134cc0c
100644
(file)
--- a/
include/asm-frv/page.h
+++ b/
include/asm-frv/page.h
@@
-3,7
+3,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <asm/virtconvert.h>
#include <asm/mem-layout.h>
#include <asm/sections.h>
#include <asm/virtconvert.h>
#include <asm/mem-layout.h>
#include <asm/sections.h>
@@
-47,8
+46,8
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#define devmem_is_allowed(pfn) 1
#define devmem_is_allowed(pfn) 1
-#define __pa(vaddr) virt_to_phys((void *)
vaddr
)
-#define __va(paddr) phys_to_virt((unsigned long)
paddr
)
+#define __pa(vaddr) virt_to_phys((void *)
(unsigned long) (vaddr)
)
+#define __va(paddr) phys_to_virt((unsigned long)
(paddr)
)
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
@@
-57,13
+56,9
@@
extern unsigned long min_low_pfn;
extern unsigned long max_pfn;
#ifdef CONFIG_MMU
extern unsigned long max_pfn;
#ifdef CONFIG_MMU
-#define pfn_to_page(pfn) (mem_map + (pfn))
-#define page_to_pfn(page) ((unsigned long) ((page) - mem_map))
#define pfn_valid(pfn) ((pfn) < max_mapnr)
#define pfn_valid(pfn) ((pfn) < max_mapnr)
-
#else
#else
-#define pfn_to_page(pfn) (&mem_map[(pfn) - (PAGE_OFFSET >> PAGE_SHIFT)])
-#define page_to_pfn(page) ((PAGE_OFFSET >> PAGE_SHIFT) + (unsigned long) ((page) - mem_map))
+#define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT)
#define pfn_valid(pfn) ((pfn) >= min_low_pfn && (pfn) < max_low_pfn)
#endif
#define pfn_valid(pfn) ((pfn) >= min_low_pfn && (pfn) < max_low_pfn)
#endif
@@
-87,6
+82,7
@@
extern unsigned long max_pfn;
#define WANT_PAGE_VIRTUAL 1
#endif
#define WANT_PAGE_VIRTUAL 1
#endif
+#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#endif /* _ASM_PAGE_H */
#include <asm-generic/page.h>
#endif /* _ASM_PAGE_H */