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>
mariux64 · Oct 4, 2012 · b2249fb · b2249fb
2 parents 1c1e436 + 2e919f7
commit b2249fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git 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
@@ -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