ARC: make allyesconfig build breakages (1540c85b) · Commits · 戴 / test

CC drivers/mmc/host/mmc_spi.o drivers/mmc/host/mmc_spi.c:118: error: redefinition of 'struct scratch' make[3]: *** [drivers/mmc/host/mmc_spi.o] Error 1 make[2]: *** [drivers/mmc/host] Error 2 make[1]: *** [drivers/mmc] Error 2 make: *** [drivers] Error 2 CC arch/arc/kernel/kgdb.o In file included from include/linux/kgdb.h:20, from arch/arc/kernel/kgdb.c:11: /home/vineetg/arc/k.org/arc-port/arch/arc/include/asm/kgdb.h:34: warning: 'struct pt_regs' declared inside parameter list /home/vineetg/arc/k.org/arc-port/arch/arc/include/asm/kgdb.h:34: warning: its scope is only this definition or declaration, which is probably not what you want arch/arc/kernel/kgdb.c:172: error: conflicting types for 'kgdb_trap' CC arch/arc/kernel/kgdb.o arch/arc/kernel/kgdb.c: In function 'pt_regs_to_gdb_regs': arch/arc/kernel/kgdb.c:62: error: dereferencing pointer to incomplete type Signed-off-by:

Vineet Gupta <vgupta@synopsys.com>

arch/arc/include/asm/kgdb.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@

		#ifdef CONFIG_KGDB

		#include <asm/user.h>
		#include <asm/ptrace.h>

		/* to ensure compatibility with Linux 2.6.35, we don't implement the get/set
		* register API yet */
		@@ -53,9 +53,7 @@ enum arc700_linux_regnums {
		};

		#else
		static inline void kgdb_trap(struct pt_regs *regs, int param)
		{
		}
		#define kgdb_trap(regs, param)
		#endif

		#endif /* __ARC_KGDB_H__ */

arch/arc/include/uapi/asm/ptrace.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,14 +28,14 @@
		*/
		struct user_regs_struct {

		struct scratch {
		struct {
		long pad;
		long bta, lp_start, lp_end, lp_count;
		long status32, ret, blink, fp, gp;
		long r12, r11, r10, r9, r8, r7, r6, r5, r4, r3, r2, r1, r0;
		long sp;
		} scratch;
		struct callee {
		struct {
		long pad;
		long r25, r24, r23, r22, r21, r20;
		long r19, r18, r17, r16, r15, r14, r13;

arch/arc/kernel/kgdb.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		*/

		#include <linux/kgdb.h>
		#include <linux/sched.h>
		#include <asm/disasm.h>
		#include <asm/cacheflush.h>

Admin message