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
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
mmu.c
diff --git
a/arch/arm/mm/mmu.c
b/arch/arm/mm/mmu.c
index
594d677
..
226f180
100644
(file)
--- a/
arch/arm/mm/mmu.c
+++ b/
arch/arm/mm/mmu.c
@@
-60,7
+60,7
@@
EXPORT_SYMBOL(pgprot_kernel);
struct cachepolicy {
const char policy[16];
unsigned int cr_mask;
struct cachepolicy {
const char policy[16];
unsigned int cr_mask;
-
unsigned int
pmd;
+
pmdval_t
pmd;
pteval_t pte;
};
pteval_t pte;
};
@@
-288,7
+288,7
@@
static void __init build_mem_type_table(void)
{
struct cachepolicy *cp;
unsigned int cr = get_cr();
{
struct cachepolicy *cp;
unsigned int cr = get_cr();
-
unsigned in
t user_pgprot, kern_pgprot, vecs_pgprot;
+
pteval_
t user_pgprot, kern_pgprot, vecs_pgprot;
int cpu_arch = cpu_architecture();
int i;
int cpu_arch = cpu_architecture();
int i;
@@
-863,14
+863,14
@@
static inline void prepare_page_table(void)
/*
* Clear out all the mappings below the kernel image.
*/
/*
* Clear out all the mappings below the kernel image.
*/
- for (addr = 0; addr < MODULES_VADDR; addr += P
GDIR
_SIZE)
+ for (addr = 0; addr < MODULES_VADDR; addr += P
MD
_SIZE)
pmd_clear(pmd_off_k(addr));
#ifdef CONFIG_XIP_KERNEL
/* The XIP kernel is mapped in the module area -- skip over it */
pmd_clear(pmd_off_k(addr));
#ifdef CONFIG_XIP_KERNEL
/* The XIP kernel is mapped in the module area -- skip over it */
- addr = ((unsigned long)_etext + P
GDIR_SIZE - 1) & PGDIR
_MASK;
+ addr = ((unsigned long)_etext + P
MD_SIZE - 1) & PMD
_MASK;
#endif
#endif
- for ( ; addr < PAGE_OFFSET; addr += P
GDIR
_SIZE)
+ for ( ; addr < PAGE_OFFSET; addr += P
MD
_SIZE)
pmd_clear(pmd_off_k(addr));
/*
pmd_clear(pmd_off_k(addr));
/*
@@
-885,10
+885,12
@@
static inline void prepare_page_table(void)
* memory bank, up to the end of the vmalloc region.
*/
for (addr = __phys_to_virt(end);
* memory bank, up to the end of the vmalloc region.
*/
for (addr = __phys_to_virt(end);
- addr < VMALLOC_END; addr += P
GDIR
_SIZE)
+ addr < VMALLOC_END; addr += P
MD
_SIZE)
pmd_clear(pmd_off_k(addr));
}
pmd_clear(pmd_off_k(addr));
}
+#define SWAPPER_PG_DIR_SIZE (PTRS_PER_PGD * sizeof(pgd_t))
+
/*
* Reserve the special regions of memory
*/
/*
* Reserve the special regions of memory
*/
@@
-898,7
+900,7
@@
void __init arm_mm_memblock_reserve(void)
* Reserve the page tables. These are already in use,
* and can only be in node 0.
*/
* Reserve the page tables. These are already in use,
* and can only be in node 0.
*/
- memblock_reserve(__pa(swapper_pg_dir),
PTRS_PER_PGD * sizeof(pgd_t)
);
+ memblock_reserve(__pa(swapper_pg_dir),
SWAPPER_PG_DIR_SIZE
);
#ifdef CONFIG_SA1111
/*
#ifdef CONFIG_SA1111
/*
@@
-926,7
+928,7
@@
static void __init devicemaps_init(struct machine_desc *mdesc)
*/
vectors_page = early_alloc(PAGE_SIZE);
*/
vectors_page = early_alloc(PAGE_SIZE);
- for (addr = VMALLOC_END; addr; addr += P
GDIR
_SIZE)
+ for (addr = VMALLOC_END; addr; addr += P
MD
_SIZE)
pmd_clear(pmd_off_k(addr));
/*
pmd_clear(pmd_off_k(addr));
/*