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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
include
/
asm-parisc
/
page.h
diff --git
a/include/asm-parisc/page.h
b/include/asm-parisc/page.h
index
fcae97e
..
a3f24a6
100644
(file)
--- a/
include/asm-parisc/page.h
+++ b/
include/asm-parisc/page.h
@@
-1,14
+1,23
@@
#ifndef _PARISC_PAGE_H
#define _PARISC_PAGE_H
#ifndef _PARISC_PAGE_H
#define _PARISC_PAGE_H
+#if !defined(__KERNEL__)
+/* this is for userspace applications (4k page size) */
+# define PAGE_SHIFT 12 /* 4k */
+# define PAGE_SIZE (1UL << PAGE_SHIFT)
+# define PAGE_MASK (~(PAGE_SIZE-1))
+#endif
+
+
#ifdef __KERNEL__
#ifdef __KERNEL__
+#include <linux/config.h>
#if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
#if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
-# define PAGE_SHIFT 12
+# define PAGE_SHIFT 12
/* 4k */
#elif defined(CONFIG_PARISC_PAGE_SIZE_16KB)
#elif defined(CONFIG_PARISC_PAGE_SIZE_16KB)
-# define PAGE_SHIFT 14
+# define PAGE_SHIFT 14
/* 16k */
#elif defined(CONFIG_PARISC_PAGE_SIZE_64KB)
#elif defined(CONFIG_PARISC_PAGE_SIZE_64KB)
-# define PAGE_SHIFT 16
+# define PAGE_SHIFT 16
/* 64k */
#else
# error "unknown default kernel page size"
#endif
#else
# error "unknown default kernel page size"
#endif
@@
-180,11
+189,11
@@
extern int npmem_ranges;
#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__ */
#define devmem_is_allowed(x) 1
#endif /* __KERNEL__ */
+#include <asm-generic/memory_model.h>
+#include <asm-generic/page.h>
+
#endif /* _PARISC_PAGE_H */
#endif /* _PARISC_PAGE_H */