From 37d11ab8b478ccb7aa2270666603ca2e5ac4c11d Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Wed, 3 Oct 2012 17:39:12 -0400 Subject: [PATCH 1/2] c6x: make dsk6455 the default config C6X had no defconfig, so DSK6455 is as good as any. Signed-off-by: Mark Salter --- arch/c6x/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile index 1d08dd070277..a9eb9597e03c 100644 --- a/arch/c6x/Makefile +++ b/arch/c6x/Makefile @@ -6,6 +6,8 @@ # for more details. # +KBUILD_DEFCONFIG := dsk6455_defconfig + cflags-y += -mno-dsbt -msdata=none cflags-$(CONFIG_C6X_BIG_KERNEL) += -mlong-calls From 2e919f76e31309d441021f73b4bd9bb2ccfb3972 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Thu, 4 Oct 2012 12:22:08 -0400 Subject: [PATCH 2/2] c6x: remove c6x signal.h The c6x signal.h includes the asm-generic version and provides a couple of extern declarations. David Howells pointed out that the externs needed to be protected by ifdef __KERNEL__. As it turns out, the externs aren't really needed since the functions are only called from asm code. So this patch gets rid of the c6x signal.h and uses just the asm-generic version. Signed-off-by: Mark Salter --- arch/c6x/include/asm/Kbuild | 1 + arch/c6x/include/asm/signal.h | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 arch/c6x/include/asm/signal.h diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild index f08e89183cda..277f1a4ecb09 100644 --- a/arch/c6x/include/asm/Kbuild +++ b/arch/c6x/include/asm/Kbuild @@ -40,6 +40,7 @@ generic-y += sembuf.h generic-y += shmbuf.h generic-y += shmparam.h generic-y += siginfo.h +generic-y += signal.h generic-y += socket.h generic-y += sockios.h generic-y += stat.h diff --git a/arch/c6x/include/asm/signal.h b/arch/c6x/include/asm/signal.h deleted file mode 100644 index f1cd870596a3..000000000000 --- a/arch/c6x/include/asm/signal.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _ASM_C6X_SIGNAL_H -#define _ASM_C6X_SIGNAL_H - -#include - -#ifndef __ASSEMBLY__ -#include - -struct pt_regs; - -extern asmlinkage int do_rt_sigreturn(struct pt_regs *regs); -extern asmlinkage void do_notify_resume(struct pt_regs *regs, - u32 thread_info_flags, - int syscall); -#endif - -#endif /* _ASM_C6X_SIGNAL_H */