Skip to contentSkip to conversation

powerpc: add more asm-prototypes.h declarations for asm exports

PATCH Applied Nicholas Piggin 2 participants 2 messages Nov 22, 2016 – Nov 24, 2016 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/1 powerpc: add more asm-prototypes.h declarations for asm exports

After patch 4efca4ed0 ("kbuild: modversions for EXPORT_SYMBOL() for asm"), asm exports can get modversions CRCs generated if they have C definitions in asm-prototypes.h. This patch adds missing definitions for 32 and 64 bit allmodconfig builds.

Fixes 9445aa1a3062 ("ppc: move exports to definitions")
Signed-off-by Nicholas Piggin <[email protected]>

---
Hi,

This should go into 4.9 to correct the modversions regression. Sorry it's taken this long, the kbuild side took a while.

Thanks,
Nick

 arch/powerpc/include/asm/asm-prototypes.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/powerpc/include/asm/asm-prototypes.h +12 -0
index d149273..e0baba1 100644
@@ -14,6 +14,10 @@
 
 #include <linux/threads.h>
 #include <linux/kprobes.h>
+#include <asm/cacheflush.h>
+#include <asm/checksum.h>
+#include <asm/uaccess.h>
+#include <asm/epapr_hcalls.h>
 
 #include <uapi/asm/ucontext.h>
 

@@ -109,4 +113,12 @@ void early_setup_secondary(void);
 /* time */
 void accumulate_stolen_time(void);
 
+/* misc runtime */
+extern u64 __bswapdi2(u64);
+extern s64 __lshrdi3(s64, int);
+extern s64 __ashldi3(s64, int);
+extern s64 __ashrdi3(s64, int);
+extern int __cmpdi2(s64, s64);
+extern int __ucmpdi2(u64, u64);
+
 #endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */
Signature · 1 line
2.10.2
Applied
#1 lore raw
Quoted 7 lines · Nicholas Piggin

After patch 4efca4ed0 ("kbuild: modversions for EXPORT_SYMBOL() for asm"), asm exports can get modversions CRCs generated if they have C definitions in asm-prototypes.h. This patch adds missing definitions for 32 and 64 bit allmodconfig builds.

Fixes 9445aa1a3062 ("ppc: move exports to definitions")
Signed-off-by Nicholas Piggin <[email protected]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/9e5f68842276672a05737c23e40725

cheers