aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-03-10 21:15:27 -0400
committerAnton Blanchard <anton@samba.org>2014-04-22 20:05:26 -0400
commit07de8377f7488f262f9694a1567ab93b4dda63bc (patch)
tree2d63e74686159eafc3b64c40df571dc1f3f8954b
parent2751b628c97e66e61f482935ca59148751972941 (diff)
powerpc: Fix ABIv2 issue with dereference_function_descriptor
Don't try and dereference a function descriptor on ABIv2. Signed-off-by: Anton Blanchard <anton@samba.org>
-rw-r--r--arch/powerpc/include/asm/sections.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h
index d0e784e0ff48..d1bb96d5a298 100644
--- a/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@ -39,6 +39,7 @@ static inline int overlaps_kernel_text(unsigned long start, unsigned long end)
39 (unsigned long)_stext < end; 39 (unsigned long)_stext < end;
40} 40}
41 41
42#if !defined(_CALL_ELF) || _CALL_ELF != 2
42#undef dereference_function_descriptor 43#undef dereference_function_descriptor
43static inline void *dereference_function_descriptor(void *ptr) 44static inline void *dereference_function_descriptor(void *ptr)
44{ 45{
@@ -49,6 +50,7 @@ static inline void *dereference_function_descriptor(void *ptr)
49 ptr = p; 50 ptr = p;
50 return ptr; 51 return ptr;
51} 52}
53#endif
52 54
53#endif 55#endif
54 56