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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-powerpc
/
pgalloc.h
diff --git
a/include/asm-powerpc/pgalloc.h
b/include/asm-powerpc/pgalloc.h
index
a00ee00
..
9916bee
100644
(file)
--- a/
include/asm-powerpc/pgalloc.h
+++ b/
include/asm-powerpc/pgalloc.h
@@
-11,19
+11,26
@@
#include <linux/cpumask.h>
#include <linux/percpu.h>
#include <linux/cpumask.h>
#include <linux/percpu.h>
-extern
kmem_cache_t
*pgtable_cache[];
+extern
struct kmem_cache
*pgtable_cache[];
#ifdef CONFIG_PPC_64K_PAGES
#define PTE_CACHE_NUM 0
#define PMD_CACHE_NUM 1
#define PGD_CACHE_NUM 2
#ifdef CONFIG_PPC_64K_PAGES
#define PTE_CACHE_NUM 0
#define PMD_CACHE_NUM 1
#define PGD_CACHE_NUM 2
+#define HUGEPTE_CACHE_NUM 3
#else
#define PTE_CACHE_NUM 0
#define PMD_CACHE_NUM 1
#define PUD_CACHE_NUM 1
#define PGD_CACHE_NUM 0
#else
#define PTE_CACHE_NUM 0
#define PMD_CACHE_NUM 1
#define PUD_CACHE_NUM 1
#define PGD_CACHE_NUM 0
+#define HUGEPTE_CACHE_NUM 2
#endif
#endif
+/* Dummy functions since we don't support execshield on ppc */
+#define arch_add_exec_range(mm, limit) do { ; } while (0)
+#define arch_flush_exec_range(mm) do { ; } while (0)
+#define arch_remove_exec_range(mm, limit) do { ; } while (0)
+
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-115,7
+122,7
@@
static inline void pte_free(struct page *ptepage)
pte_free_kernel(page_address(ptepage));
}
pte_free_kernel(page_address(ptepage));
}
-#define PGF_CACHENUM_MASK 0x
f
+#define PGF_CACHENUM_MASK 0x
3
typedef struct pgtable_free {
unsigned long val;
typedef struct pgtable_free {
unsigned long val;