Fixup and coding convention
Subsystems (3)
[email protected]
maintainercover Fixup and coding convention
From: Guo Ren <[email protected]>
Two small modifications for fixup abiv1 compile and coding convention.
Guo Ren (2):
csky: cmpxchg: Coding convention for BUILD_BUG()
csky: abiv1: Fixup compile error
arch/csky/abiv1/inc/abi/string.h | 6 ++++++ arch/csky/include/asm/cmpxchg.h | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-)
Signature · 1 line
2.36.1
[email protected]
maintainerPATCH 1/2 csky: cmpxchg: Coding convention for BUILD_BUG()
From: Guo Ren <[email protected]>
Use BUILD_BUG() instead of the custom bad_xchg.
--- arch/csky/include/asm/cmpxchg.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/csky/include/asm/cmpxchg.h +5 -6
@@ -4,10 +4,9 @@#define __ASM_CSKY_CMPXCHG_H#ifdef CONFIG_SMP +#include <linux/bug.h> #include <asm/barrier.h> -extern void __bad_xchg (void ); -#define __xchg_relaxed (new, ptr, size) \ ({ \ __typeof__(ptr) __ptr = (ptr); \
@@ -46,7 +45,7 @@ extern void __bad_xchg(void); :); \break ; \default : \ -__bad_xchg (); \ +BUILD_BUG (); \ } \ __ret; \ })
@@ -76,7 +75,7 @@ extern void __bad_xchg(void); :); \break ; \default : \ -__bad_xchg (); \ +BUILD_BUG (); \ } \ __ret; \ })
@@ -107,7 +106,7 @@ extern void __bad_xchg(void); :); \break ; \default : \ -__bad_xchg (); \ +BUILD_BUG (); \ } \ __ret; \ })
@@ -139,7 +138,7 @@ extern void __bad_xchg(void); :); \break ; \default : \ -__bad_xchg (); \ +BUILD_BUG (); \ } \ __ret; \ })
Signature · 1 line
2.36.1
[email protected]
maintainerPATCH 2/2 csky: abiv1: Fixup compile error
In reply to [email protected]From: Guo Ren <[email protected]>
LD vmlinux.oarch/csky/lib/string.o: In function `memmove':
string.c:(.text+0x108): multiple definition of memmove' lib/string.o:string.c:(.text+0x7e8): first defined here arch/csky/lib/string.o: In function memset':
string.c:(.text+0x148): multiple definition of `memset' lib/string.o:string.c:(.text+0x2ac): first defined here scripts/Makefile.vmlinux_o:68: recipe for target 'vmlinux.o' failed make[4]: *** [vmlinux.o] Error 1
--- arch/csky/abiv1/inc/abi/string.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/csky/abiv1/inc/abi/string.h +6 -0
@@ -6,4 +6,10 @@#define __HAVE_ARCH_MEMCPYextern void *memcpy (void *,const void *,__kernel_size_t ); +#define __HAVE_ARCH_MEMMOVE +extern void *memmove (void *,const void *,__kernel_size_t ); + +#define __HAVE_ARCH_MEMSET +extern void *memset (void *,int ,__kernel_size_t ); +#endif /* __ABI_CSKY_STRING_H */
Signature · 1 line
2.36.1