git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
page_32.h
diff --git
a/arch/powerpc/include/asm/page_32.h
b/arch/powerpc/include/asm/page_32.h
index
d77072a
..
1458d95
100644
(file)
--- a/
arch/powerpc/include/asm/page_32.h
+++ b/
arch/powerpc/include/asm/page_32.h
@@
-19,6
+19,8
@@
#define PTE_FLAGS_OFFSET 0
#endif
#define PTE_FLAGS_OFFSET 0
#endif
+#define PTE_SHIFT (PAGE_SHIFT - PTE_T_LOG2) /* full page */
+
#ifndef __ASSEMBLY__
/*
* The basic type of a PTE - 64 bits for those CPUs with > 32 bit
#ifndef __ASSEMBLY__
/*
* The basic type of a PTE - 64 bits for those CPUs with > 32 bit
@@
-26,10
+28,8
@@
*/
#ifdef CONFIG_PTE_64BIT
typedef unsigned long long pte_basic_t;
*/
#ifdef CONFIG_PTE_64BIT
typedef unsigned long long pte_basic_t;
-#define PTE_SHIFT (PAGE_SHIFT - 3) /* 512 ptes per page */
#else
typedef unsigned long pte_basic_t;
#else
typedef unsigned long pte_basic_t;
-#define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */
#endif
struct page;
#endif
struct page;
@@
-39,6
+39,9
@@
extern void copy_page(void *to, void *from);
#include <asm-generic/page.h>
#include <asm-generic/page.h>
+#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
+#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
+
#endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_PAGE_32_H */
#endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_PAGE_32_H */