diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /include/asm-powerpc/mmu-hash64.h | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'include/asm-powerpc/mmu-hash64.h')
| -rw-r--r-- | include/asm-powerpc/mmu-hash64.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h index f35d1e164da8..d1dc16afb118 100644 --- a/include/asm-powerpc/mmu-hash64.h +++ b/include/asm-powerpc/mmu-hash64.h | |||
| @@ -177,6 +177,7 @@ extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; | |||
| 177 | extern int mmu_linear_psize; | 177 | extern int mmu_linear_psize; |
| 178 | extern int mmu_virtual_psize; | 178 | extern int mmu_virtual_psize; |
| 179 | extern int mmu_vmalloc_psize; | 179 | extern int mmu_vmalloc_psize; |
| 180 | extern int mmu_vmemmap_psize; | ||
| 180 | extern int mmu_io_psize; | 181 | extern int mmu_io_psize; |
| 181 | extern int mmu_kernel_ssize; | 182 | extern int mmu_kernel_ssize; |
| 182 | extern int mmu_highuser_ssize; | 183 | extern int mmu_highuser_ssize; |