projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge /spare/repo/linux-2.6/
[powerpc.git]
/
include
/
asm-cris
/
page.h
diff --git
a/include/asm-cris/page.h
b/include/asm-cris/page.h
index
bbf17bd
..
c99c478
100644
(file)
--- a/
include/asm-cris/page.h
+++ b/
include/asm-cris/page.h
@@
-70,19
+70,6
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-/* Pure 2^n version of get_order */
-static inline int get_order(unsigned long size)
-{
- int order;
-
- size = (size-1) >> (PAGE_SHIFT-1);
- order = -1;
- do {
- size >>= 1;
- order++;
- } while (size);
- return order;
-}
#endif /* __ASSEMBLY__ */
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
#endif /* __ASSEMBLY__ */
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
@@
-90,5
+77,7
@@
static inline int get_order(unsigned long size)
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */
+#include <asm-generic/page.h>
+
#endif /* _CRIS_PAGE_H */
#endif /* _CRIS_PAGE_H */