projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
include
/
asm-powerpc
/
pgtable.h
diff --git
a/include/asm-powerpc/pgtable.h
b/include/asm-powerpc/pgtable.h
index
e9f1f46
..
8dbf5ad
100644
(file)
--- a/
include/asm-powerpc/pgtable.h
+++ b/
include/asm-powerpc/pgtable.h
@@
-12,7
+12,6
@@
*/
#ifndef __ASSEMBLY__
*/
#ifndef __ASSEMBLY__
-#include <linux/config.h>
#include <linux/stddef.h>
#include <asm/processor.h> /* For TASK_SIZE */
#include <asm/mmu.h>
#include <linux/stddef.h>
#include <asm/processor.h> /* For TASK_SIZE */
#include <asm/mmu.h>
@@
-47,8
+46,8
@@
struct mm_struct;
/*
* Define the address range of the vmalloc VM area.
*/
/*
* Define the address range of the vmalloc VM area.
*/
-#define VMALLOC_START
(0xD000000000000000ul
)
-#define VMALLOC_SIZE
(0x80000000000UL
)
+#define VMALLOC_START
ASM_CONST(0xD000000000000000
)
+#define VMALLOC_SIZE
ASM_CONST(0x80000000000
)
#define VMALLOC_END (VMALLOC_START + VMALLOC_SIZE)
/*
#define VMALLOC_END (VMALLOC_START + VMALLOC_SIZE)
/*
@@
-413,12
+412,6
@@
static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
flush_tlb_pending();
}
pte = __pte(pte_val(pte) & ~_PAGE_HPTEFLAGS);
flush_tlb_pending();
}
pte = __pte(pte_val(pte) & ~_PAGE_HPTEFLAGS);
-
-#ifdef CONFIG_PPC_64K_PAGES
- if (mmu_virtual_psize != MMU_PAGE_64K)
- pte = __pte(pte_val(pte) | _PAGE_COMBO);
-#endif /* CONFIG_PPC_64K_PAGES */
-
*ptep = pte;
}
*ptep = pte;
}