Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Avoid later problems with c6x's asm/signal.h lacking __KERNEL__ guards.

Signed-off-by: David Howells <dhowells@redhat.com>

David Howells 13 years ago b2249fbd 1c1e4362

+3 -17

3 changed files

expand all

arch

c6x

Makefile

include

asm

Kbuild

signal.h

arch/c6x/Makefile

··· 6 6 # for more details. 7 7 # 8 8 9 + KBUILD_DEFCONFIG := dsk6455_defconfig 10 + 9 11 cflags-y += -mno-dsbt -msdata=none 10 12 11 13 cflags-$(CONFIG_C6X_BIG_KERNEL) += -mlong-calls

arch/c6x/include/asm/Kbuild

··· 40 40 generic-y += shmbuf.h 41 41 generic-y += shmparam.h 42 42 generic-y += siginfo.h 43 + generic-y += signal.h 43 44 generic-y += socket.h 44 45 generic-y += sockios.h 45 46 generic-y += stat.h

-17

arch/c6x/include/asm/signal.h

··· 1 - #ifndef _ASM_C6X_SIGNAL_H 2 - #define _ASM_C6X_SIGNAL_H 3 - 4 - #include <asm-generic/signal.h> 5 - 6 - #ifndef __ASSEMBLY__ 7 - #include <linux/linkage.h> 8 - 9 - struct pt_regs; 10 - 11 - extern asmlinkage int do_rt_sigreturn(struct pt_regs *regs); 12 - extern asmlinkage void do_notify_resume(struct pt_regs *regs, 13 - u32 thread_info_flags, 14 - int syscall); 15 - #endif 16 - 17 - #endif /* _ASM_C6X_SIGNAL_H */