diff options
| author | Manuel Lauss <manuel.lauss@gmail.com> | 2009-09-24 21:44:24 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2009-09-25 19:49:27 +0200 |
| commit | d71789b6fa37c21ce5eb588d279f57904a62e7e2 (patch) | |
| tree | 0b9d7d139f2a85a0ecbea18a70866419d05dea24 /arch/mips | |
| parent | Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-d71789b6fa37c21ce5eb588d279f57904a62e7e2.tar.xz linux-d71789b6fa37c21ce5eb588d279f57904a62e7e2.zip | |
mips: fix build of vmlinux.lds
Commit 51b563fc93c8cb5bff1d67a0a71c374e4a4ea049 ("arm, cris, mips,
sparc, powerpc, um, xtensa: fix build with bash 4.0") removed a few
CPPFLAGS with vital include paths necessary to build vmlinux.lds
on MIPS, and moved the calculation of the 'jiffies' symbol
directly to vmlinux.lds.S but forgot to change make ifdef/... to
cpp macros.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
[sam: moved assignment of CPPFLAGS arch/mips/kernel/Makefile]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index e96122159928..eecd2a9f155c 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -2,6 +2,8 @@ # Makefile for the Linux/MIPS kernel. # +CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS) + extra-y := head.o init_task.o vmlinux.lds obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \ diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index 9bf0e3df7c5a..162b29954baa 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S @@ -11,15 +11,15 @@ PHDRS { note PT_NOTE FLAGS(4); /* R__ */ } -ifdef CONFIG_32BIT - ifdef CONFIG_CPU_LITTLE_ENDIAN +#ifdef CONFIG_32BIT + #ifdef CONFIG_CPU_LITTLE_ENDIAN jiffies = jiffies_64; - else + #else jiffies = jiffies_64 + 4; - endif -else + #endif +#else jiffies = jiffies_64; -endif +#endif SECTIONS { |