Commit b2249fbd authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
parents 1c1e4362 2e919f76

arch/c6x/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
# for more details.

#



KBUILD_DEFCONFIG := dsk6455_defconfig



cflags-y += -mno-dsbt -msdata=none



cflags-$(CONFIG_C6X_BIG_KERNEL) += -mlong-calls

arch/c6x/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/c6x/include/asm/signal.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#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 */