Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull c6x updates from Mark Salter.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: pass endianness info to sparse
  c6x: fix platforms/plldata.c get_coreid build error
  c6x: remove unused KTHREAD_SIZE definition

diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile
index 6f6096ff05a462182797cc75587f70c7d6286a53..6ab942e6c534a01be558b1a1e85511b4f6dacbe9 100644 (file)
--- a/arch/c6x/Makefile
+++ b/arch/c6x/Makefile
@@ -25,6 +25,7 @@ KBUILD_AFLAGS   += -mbig-endian
 LINKFLAGS       += -mbig-endian
 KBUILD_LDFLAGS  += -mbig-endian
 LDFLAGS += -EB
+CHECKFLAGS     += -D_BIG_ENDIAN
 endif
 
 head-y          := arch/c6x/kernel/head.o

diff --git a/arch/c6x/kernel/asm-offsets.c b/arch/c6x/kernel/asm-offsets.c
index cff57764fcad1fbbfc3bdbbf024045a4ee87398b..0f8fde494875edd371e36ad0315c6435ab3b3915 100644 (file)
--- a/arch/c6x/kernel/asm-offsets.c
+++ b/arch/c6x/kernel/asm-offsets.c
@@ -107,7 +107,6 @@ void foo(void)
        /* These would be unneccessary if we ran asm files
         * through the preprocessor.
         */
-       DEFINE(KTHREAD_SIZE, THREAD_SIZE);
        DEFINE(KTHREAD_SHIFT, THREAD_SHIFT);
        DEFINE(KTHREAD_START_SP, THREAD_START_SP);
        DEFINE(ENOSYS_, ENOSYS);

diff --git a/arch/c6x/platforms/plldata.c b/arch/c6x/platforms/plldata.c
index e8b6cc6a7b5ac4e97f20877e05817e209fff7e91..1ef04b5ab93fa731a6cff93ada07452fbcd9fbce 100644 (file)
--- a/arch/c6x/platforms/plldata.c
+++ b/arch/c6x/platforms/plldata.c
@@ -19,6 +19,7 @@
 
 #include <asm/clock.h>
 #include <asm/setup.h>
+#include <asm/special_insns.h>
 #include <asm/irq.h>
 
 /*