diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 21:11:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 21:11:00 -0500 |
| commit | 0d514f040ac6629311974889d5b96bcf21c6461a (patch) | |
| tree | af11d40688eabe88f25d21a1af847a761cb3a843 /include/asm-powerpc/pgtable-4k.h | |
| parent | 5ee1af9f519e6dc5a7d7912e87a1aaec857c8818 (diff) | |
| parent | 1bd79336a426c5e4f3bab142407059ceb12cadf9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: Fix various syscall/signal/swapcontext bugs
[PATCH] powerpc: incorrect rmo_top handling in prom_init
[PATCH] powerpc: Fix incorrect pud_ERROR() message
[PATCH] powerpc: Expose SMT and L1 icache snoop userland features
[PATCH] powerpc: Fix windfarm_pm112 not starting all control loops
[PATCH] powerpc: Fix old g5 issues with windfarm
powerpc32: Fix timebase synchronization on 32-bit powermacs
powerpc: Turn off verbose debug output in powermac platform functions
powerpc: Fix might-sleep warning in program check exception handler
Diffstat (limited to 'include/asm-powerpc/pgtable-4k.h')
| -rw-r--r-- | include/asm-powerpc/pgtable-4k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h index e9590c06ad92..80a7832d2721 100644 --- a/include/asm-powerpc/pgtable-4k.h +++ b/include/asm-powerpc/pgtable-4k.h | |||
| @@ -88,4 +88,4 @@ | |||
| 88 | (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) | 88 | (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) |
| 89 | 89 | ||
| 90 | #define pud_ERROR(e) \ | 90 | #define pud_ERROR(e) \ |
| 91 | printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pud_val(e)) | 91 | printk("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e)) |