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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-sparc
/
page.h
diff --git
a/include/asm-sparc/page.h
b/include/asm-sparc/page.h
index
a7dafac
..
9122684
100644
(file)
--- a/
include/asm-sparc/page.h
+++ b/
include/asm-sparc/page.h
@@
-8,8
+8,7
@@
#ifndef _SPARC_PAGE_H
#define _SPARC_PAGE_H
#ifndef _SPARC_PAGE_H
#define _SPARC_PAGE_H
-#ifdef __KERNEL__
-
+#include <linux/config.h>
#ifdef CONFIG_SUN4
#define PAGE_SHIFT 13
#else
#ifdef CONFIG_SUN4
#define PAGE_SHIFT 13
#else
@@
-23,6
+22,8
@@
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
+#ifdef __KERNEL__
+
#include <asm/btfixup.h>
#ifndef __ASSEMBLY__
#include <asm/btfixup.h>
#ifndef __ASSEMBLY__
@@
-151,7
+152,8
@@
extern unsigned long pfn_base;
#define virt_to_phys __pa
#define phys_to_virt __va
#define virt_to_phys __pa
#define phys_to_virt __va
-#define ARCH_PFN_OFFSET (pfn_base)
+#define pfn_to_page(pfn) (mem_map + ((pfn)-(pfn_base)))
+#define page_to_pfn(page) ((unsigned long)(((page) - mem_map) + pfn_base))
#define virt_to_page(kaddr) (mem_map + ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT)))
#define pfn_valid(pfn) (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))
#define virt_to_page(kaddr) (mem_map + ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT)))
#define pfn_valid(pfn) (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))
@@
-160,11
+162,8
@@
extern unsigned long pfn_base;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
-#define devmem_is_allowed(x) 1
-
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */
+#include <asm-generic/page.h>
+
#endif /* _SPARC_PAGE_H */
#endif /* _SPARC_PAGE_H */