diff options
| author |   Anton Blanchard <anton@samba.org> | 2014-03-10 09:44:22 +1100 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2014-04-23 10:05:22 +1000 |
| commit | b86206e4c32cbe6ac3de1c6dc52c2d64bcf461cb (patch) | |
| tree | bbad949975ee4a562d9aed6800e54a035cfb03a3 /arch/powerpc/mm/slb.c | |
| parent | powerpc: Use ppc_function_entry instead of open coding it (diff) | |
| download | linux-dev-b86206e4c32cbe6ac3de1c6dc52c2d64bcf461cb.tar.xz linux-dev-b86206e4c32cbe6ac3de1c6dc52c2d64bcf461cb.zip | |
powerpc: Fix branch patching code for ABIv2
The MMU hashtable and SLB branch patching code uses function
pointers for the update sites. This creates a difference between
ABIv1 and ABIv2 because we don't have function descriptors on
ABIv2.
Get rid of the function pointer and just point at the update
sites directly. This works on both ABIs.
Signed-off-by: Anton Blanchard <anton@samba.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/mm/slb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index 9d1d33cd2be5..4623366f82e9 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c @@ -256,10 +256,14 @@ static inline void patch_slb_encoding(unsigned int *insn_addr, patch_instruction(insn_addr, insn); } +extern u32 slb_compare_rr_to_size[]; +extern u32 slb_miss_kernel_load_linear[]; +extern u32 slb_miss_kernel_load_io[]; +extern u32 slb_compare_rr_to_size[]; +extern u32 slb_miss_kernel_load_vmemmap[]; + void slb_set_size(u16 size) { - extern unsigned int *slb_compare_rr_to_size; - if (mmu_slb_size == size) return; @@ -272,11 +276,7 @@ void slb_initialize(void) unsigned long linear_llp, vmalloc_llp, io_llp; unsigned long lflags, vflags; static int slb_encoding_inited; - extern unsigned int *slb_miss_kernel_load_linear; - extern unsigned int *slb_miss_kernel_load_io; - extern unsigned int *slb_compare_rr_to_size; #ifdef CONFIG_SPARSEMEM_VMEMMAP - extern unsigned int *slb_miss_kernel_load_vmemmap; unsigned long vmemmap_llp; #endif |