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

Commit 0d9df251 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  alpha: fix build after vmlinux.lds.S cleanup
  mips: fix build of vmlinux.lds
parents cce1d9f2 de078ef5

arch/alpha/kernel/vmlinux.lds.S

+1 −0
Original line number Original line Diff line number Diff line 
#include <asm-generic/vmlinux.lds.h>

#include <asm-generic/vmlinux.lds.h>

#include <asm/thread_info.h>

#include <asm/page.h>

#include <asm/page.h>

#include <asm/thread_info.h>

#include <asm/thread_info.h>

arch/mips/kernel/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Makefile for the Linux/MIPS kernel.

# Makefile for the Linux/MIPS kernel.

#

#





CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS)



extra-y		:= head.o init_task.o vmlinux.lds

extra-y		:= head.o init_task.o vmlinux.lds





obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \

obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \

arch/mips/kernel/vmlinux.lds.S

+6 −6
Original line number Original line Diff line number Diff line
@@ -11,15 +11,15 @@ PHDRS { 
	note PT_NOTE FLAGS(4);	/* R__ */

	note PT_NOTE FLAGS(4);	/* R__ */

}

}





ifdef CONFIG_32BIT

#ifdef CONFIG_32BIT

	ifdef CONFIG_CPU_LITTLE_ENDIAN

	#ifdef CONFIG_CPU_LITTLE_ENDIAN

		jiffies  = jiffies_64;

		jiffies  = jiffies_64;

	else

	#else

		jiffies  = jiffies_64 + 4;

		jiffies  = jiffies_64 + 4;

	endif

	#endif

else

#else

	jiffies  = jiffies_64;

	jiffies  = jiffies_64;

endif

#endif





SECTIONS

SECTIONS

{

{