diff options
| author | James Bottomley | 2016-07-06 16:25:55 +0200 |
|---|---|---|
| committer | James Bottomley | 2016-07-06 16:25:55 +0200 |
| commit | ea1a25c3348abc33d7d94db28501766adf3d1c7d (patch) | |
| tree | ca3c5c8b72532117034dd2d57a2a85eead13db7b /arch/powerpc/mm/mmu_decl.h | |
| parent | SCSI: fix new bug in scsi_dev_info_list string matching (diff) | |
| parent | qla2xxx: Fix NULL pointer deref in QLA interrupt (diff) | |
| download | kernel-qcow2-linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.tar.gz kernel-qcow2-linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.tar.xz kernel-qcow2-linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.zip | |
Merge branch 'jejb-fixes' into fixes
Diffstat (limited to 'arch/powerpc/mm/mmu_decl.h')
| -rw-r--r-- | arch/powerpc/mm/mmu_decl.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index bfb7c0bcabd5..6af65327c993 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -108,11 +108,6 @@ extern unsigned long Hash_size, Hash_mask; #endif /* CONFIG_PPC32 */ -#ifdef CONFIG_PPC64 -extern int map_kernel_page(unsigned long ea, unsigned long pa, - unsigned long flags); -#endif /* CONFIG_PPC64 */ - extern unsigned long ioremap_bot; extern unsigned long __max_low_memory; extern phys_addr_t __initial_memory_limit_addr; |