diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 04:17:15 -0400 |
| commit | 28638ea4f8adb63f837e4436560ab16ab0388587 (patch) | |
| tree | 2dab7a03d7696697c82ba62a03700d3a2f3639b1 /include/asm-powerpc/mmu-hash64.h | |
| parent | f781b03c4b1c713ac000877c8bbc31fc4164a29b (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c
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 0dff76776044..39c5c5f62bf5 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; |