git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-m32r
/
page.h
diff --git
a/include/asm-m32r/page.h
b/include/asm-m32r/page.h
index
4ab5788
..
404a4c2
100644
(file)
--- a/
include/asm-m32r/page.h
+++ b/
include/asm-m32r/page.h
@@
-1,7
+1,6
@@
#ifndef _ASM_M32R_PAGE_H
#define _ASM_M32R_PAGE_H
#ifndef _ASM_M32R_PAGE_H
#define _ASM_M32R_PAGE_H
-#include <linux/config.h>
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
@@
-76,9
+75,7
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#ifndef CONFIG_DISCONTIGMEM
#define PFN_BASE (CONFIG_MEMORY_START >> PAGE_SHIFT)
#ifndef CONFIG_DISCONTIGMEM
#define PFN_BASE (CONFIG_MEMORY_START >> PAGE_SHIFT)
-#define pfn_to_page(pfn) (mem_map + ((pfn) - PFN_BASE))
-#define page_to_pfn(page) \
- ((unsigned long)((page) - mem_map) + PFN_BASE)
+#define ARCH_PFN_OFFSET PFN_BASE
#define pfn_valid(pfn) (((pfn) - PFN_BASE) < max_mapnr)
#endif /* !CONFIG_DISCONTIGMEM */
#define pfn_valid(pfn) (((pfn) - PFN_BASE) < max_mapnr)
#endif /* !CONFIG_DISCONTIGMEM */
@@
-90,9
+87,9
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#define devmem_is_allowed(x) 1
#define devmem_is_allowed(x) 1
-#endif /* __KERNEL__ */
-
+#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
#endif /* _ASM_M32R_PAGE_H */
#endif /* _ASM_M32R_PAGE_H */