[PATCH 21/33] powerpc: Fix ABIv2 issue with dereference_function_descriptor

Anton Blanchard anton at samba.org
Tue Mar 25 22:44:27 EST 2014


Don't try and dereference a function descriptor on ABIv2.

Signed-off-by: Anton Blanchard <anton at samba.org>
---
 arch/powerpc/include/asm/sections.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h
index d0e784e..d1bb96d 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)
 		(unsigned long)_stext < end;
 }
 
+#if !defined(_CALL_ELF) || _CALL_ELF != 2
 #undef dereference_function_descriptor
 static inline void *dereference_function_descriptor(void *ptr)
 {
@@ -49,6 +50,7 @@ static inline void *dereference_function_descriptor(void *ptr)
 		ptr = p;
 	return ptr;
 }
+#endif
 
 #endif
 
-- 
1.8.3.2



More information about the Linuxppc-dev mailing list