diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /include/asm-powerpc/mmu-hash64.h | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 39c5c5f62bf5..d1dc16afb118 100644 --- a/include/asm-powerpc/mmu-hash64.h +++ b/include/asm-powerpc/mmu-hash64.h | |||
| @@ -182,6 +182,7 @@ extern int mmu_io_psize; | |||
| 182 | extern int mmu_kernel_ssize; | 182 | extern int mmu_kernel_ssize; |
| 183 | extern int mmu_highuser_ssize; | 183 | extern int mmu_highuser_ssize; |
| 184 | extern u16 mmu_slb_size; | 184 | extern u16 mmu_slb_size; |
| 185 | extern unsigned long tce_alloc_start, tce_alloc_end; | ||
| 185 | 186 | ||
| 186 | /* | 187 | /* |
| 187 | * If the processor supports 64k normal pages but not 64k cache | 188 | * If the processor supports 64k normal pages but not 64k cache |