lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2009-09-26 10:51:54 -07:00
parent cce1d9f232 de078ef55c
commit 0d9df2515d
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/alpha/kernel/vmlinux.lds.S
View File

@@ -1,4 +1,5 @@
#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>

2
arch/mips/kernel/Makefile
View File

@@ -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 \

12
arch/mips/kernel/vmlinux.lds.S
View File

@@ -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
{ {