diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-07 22:28:14 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-07 22:28:14 -0500 |
| commit | 688016f4e2028e3c2c27e959ad001536e10ee2c5 (patch) | |
| tree | f45baa7b2c115f1297b4ad8d30b306204ef5e537 /arch/ppc/mm/mmu_decl.h | |
| parent | 2c84b4076c0cbbc44ffea2ae1da2a801fb23f081 (diff) | |
| parent | 29273158f82020241d9a6539d6cef9cf926654c9 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/ppc/mm/mmu_decl.h')
| -rw-r--r-- | arch/ppc/mm/mmu_decl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/mm/mmu_decl.h b/arch/ppc/mm/mmu_decl.h index 540f3292b229..f1d4f2109a99 100644 --- a/arch/ppc/mm/mmu_decl.h +++ b/arch/ppc/mm/mmu_decl.h | |||
| @@ -54,12 +54,12 @@ extern unsigned int num_tlbcam_entries; | |||
| 54 | #define mmu_mapin_ram() (0UL) | 54 | #define mmu_mapin_ram() (0UL) |
| 55 | 55 | ||
| 56 | #elif defined(CONFIG_4xx) | 56 | #elif defined(CONFIG_4xx) |
| 57 | #define flush_HPTE(X, va, pg) _tlbie(va) | 57 | #define flush_HPTE(pid, va, pg) _tlbie(va, pid) |
| 58 | extern void MMU_init_hw(void); | 58 | extern void MMU_init_hw(void); |
| 59 | extern unsigned long mmu_mapin_ram(void); | 59 | extern unsigned long mmu_mapin_ram(void); |
| 60 | 60 | ||
| 61 | #elif defined(CONFIG_FSL_BOOKE) | 61 | #elif defined(CONFIG_FSL_BOOKE) |
| 62 | #define flush_HPTE(X, va, pg) _tlbie(va) | 62 | #define flush_HPTE(pid, va, pg) _tlbie(va, pid) |
| 63 | extern void MMU_init_hw(void); | 63 | extern void MMU_init_hw(void); |
| 64 | extern unsigned long mmu_mapin_ram(void); | 64 | extern unsigned long mmu_mapin_ram(void); |
| 65 | extern void adjust_total_lowmem(void); | 65 | extern void adjust_total_lowmem(void); |