diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-10 14:50:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-10 14:50:14 -0400 |
commit | f77cfbe6455a67d4e9b69f08f07fc62cd11b0674 (patch) | |
tree | c881dee819725fcd3a575bc70581488c5742404d | |
parent | 948869fa9f391664cfe008fa9968a1110bfd14fd (diff) | |
parent | 85fa2cc51104ee5b529ce85b12f4c8421888544f (diff) |
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
-rw-r--r-- | arch/c6x/Makefile | 1 | ||||
-rw-r--r-- | arch/c6x/kernel/asm-offsets.c | 1 | ||||
-rw-r--r-- | arch/c6x/platforms/plldata.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile index 6f6096ff05a4..6ab942e6c534 100644 --- a/arch/c6x/Makefile +++ b/arch/c6x/Makefile | |||
@@ -25,6 +25,7 @@ KBUILD_AFLAGS += -mbig-endian | |||
25 | LINKFLAGS += -mbig-endian | 25 | LINKFLAGS += -mbig-endian |
26 | KBUILD_LDFLAGS += -mbig-endian | 26 | KBUILD_LDFLAGS += -mbig-endian |
27 | LDFLAGS += -EB | 27 | LDFLAGS += -EB |
28 | CHECKFLAGS += -D_BIG_ENDIAN | ||
28 | endif | 29 | endif |
29 | 30 | ||
30 | head-y := arch/c6x/kernel/head.o | 31 | head-y := arch/c6x/kernel/head.o |
diff --git a/arch/c6x/kernel/asm-offsets.c b/arch/c6x/kernel/asm-offsets.c index cff57764fcad..0f8fde494875 100644 --- a/arch/c6x/kernel/asm-offsets.c +++ b/arch/c6x/kernel/asm-offsets.c | |||
@@ -107,7 +107,6 @@ void foo(void) | |||
107 | /* These would be unneccessary if we ran asm files | 107 | /* These would be unneccessary if we ran asm files |
108 | * through the preprocessor. | 108 | * through the preprocessor. |
109 | */ | 109 | */ |
110 | DEFINE(KTHREAD_SIZE, THREAD_SIZE); | ||
111 | DEFINE(KTHREAD_SHIFT, THREAD_SHIFT); | 110 | DEFINE(KTHREAD_SHIFT, THREAD_SHIFT); |
112 | DEFINE(KTHREAD_START_SP, THREAD_START_SP); | 111 | DEFINE(KTHREAD_START_SP, THREAD_START_SP); |
113 | DEFINE(ENOSYS_, ENOSYS); | 112 | DEFINE(ENOSYS_, ENOSYS); |
diff --git a/arch/c6x/platforms/plldata.c b/arch/c6x/platforms/plldata.c index e8b6cc6a7b5a..1ef04b5ab93f 100644 --- a/arch/c6x/platforms/plldata.c +++ b/arch/c6x/platforms/plldata.c | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include <asm/clock.h> | 20 | #include <asm/clock.h> |
21 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
22 | #include <asm/special_insns.h> | ||
22 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
23 | 24 | ||
24 | /* | 25 | /* |