projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh: build fixes for defconfigs.
[powerpc.git]
/
include
/
asm-m68knommu
/
page.h
diff --git
a/include/asm-m68knommu/page.h
b/include/asm-m68knommu/page.h
index
ff6a926
..
2a1b8bd
100644
(file)
--- a/
include/asm-m68knommu/page.h
+++ b/
include/asm-m68knommu/page.h
@@
-1,7
+1,7
@@
#ifndef _M68KNOMMU_PAGE_H
#define _M68KNOMMU_PAGE_H
#ifndef _M68KNOMMU_PAGE_H
#define _M68KNOMMU_PAGE_H
-#i
nclude <linux/config.h>
+#i
fdef __KERNEL__
/* PAGE_SHIFT determines the page size */
/* PAGE_SHIFT determines the page size */
@@
-9,8
+9,6
@@
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
#include <asm/setup.h>
#ifndef __ASSEMBLY__
#include <asm/setup.h>
#ifndef __ASSEMBLY__
@@
-48,20
+46,6
@@
typedef struct { unsigned long pgprot; } pgprot_t;
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-/* Pure 2^n version of get_order */
-extern __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;
-}
-
extern unsigned long memory_start;
extern unsigned long memory_end;
extern unsigned long memory_start;
extern unsigned long memory_end;
@@
-91,6
+75,8
@@
extern unsigned long memory_end;
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
+#include <asm-generic/page.h>
+
#endif /* __KERNEL__ */
#endif /* _M68KNOMMU_PAGE_H */
#endif /* __KERNEL__ */
#endif /* _M68KNOMMU_PAGE_H */