diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-04 17:37:01 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-04 17:37:01 +0100 |
| commit | b2249fbd7cbc6741e64474d8617453d20acc12e6 (patch) | |
| tree | 47bf7600f5e96a6ae1dd069a056fc85e73e2b671 | |
| parent | 1c1e436269fe840cdbecfaf397b21778dd276f26 (diff) | |
| parent | 2e919f76e31309d441021f73b4bd9bb2ccfb3972 (diff) | |
| download | linux-b2249fbd7cbc6741e64474d8617453d20acc12e6.tar.bz2 | |
Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep
Avoid later problems with c6x's asm/signal.h lacking __KERNEL__ guards.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | arch/c6x/Makefile | 2 | ||||
| -rw-r--r-- | arch/c6x/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/c6x/include/asm/signal.h | 17 |
3 files changed, 3 insertions, 17 deletions
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 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 <asm-generic/signal.h> - -#ifndef __ASSEMBLY__ -#include <linux/linkage.h> - -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 */ |