Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f77cfbe6 authored Apr 10, 2018 by Linus Torvalds

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

parents 948869fa 85fa2cc5

arch/c6x/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ KBUILD_AFLAGS += -mbig-endian
	LINKFLAGS += -mbig-endian		LINKFLAGS += -mbig-endian
	KBUILD_LDFLAGS += -mbig-endian		KBUILD_LDFLAGS += -mbig-endian
	LDFLAGS += -EB		LDFLAGS += -EB
			CHECKFLAGS += -D_BIG_ENDIAN
	endif		endif

	head-y := arch/c6x/kernel/head.o		head-y := arch/c6x/kernel/head.o

arch/c6x/kernel/asm-offsets.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -107,7 +107,6 @@ void foo(void)
	/* These would be unneccessary if we ran asm files		/* These would be unneccessary if we ran asm files
	* through the preprocessor.		* through the preprocessor.
	*/		*/
	DEFINE(KTHREAD_SIZE, THREAD_SIZE);
	DEFINE(KTHREAD_SHIFT, THREAD_SHIFT);		DEFINE(KTHREAD_SHIFT, THREAD_SHIFT);
	DEFINE(KTHREAD_START_SP, THREAD_START_SP);		DEFINE(KTHREAD_START_SP, THREAD_START_SP);
	DEFINE(ENOSYS_, ENOSYS);		DEFINE(ENOSYS_, ENOSYS);

arch/c6x/platforms/plldata.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@

	#include <asm/clock.h>		#include <asm/clock.h>
	#include <asm/setup.h>		#include <asm/setup.h>
			#include <asm/special_insns.h>
	#include <asm/irq.h>		#include <asm/irq.h>

	/*		/*