summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:51:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:51:54 -0700
commit0d9df2515dbceb67d343c0f10fd3ff218380d524 (patch)
tree9b0f96173e1f63eacb72d7a527177771e6ff46a1
parentcce1d9f23213f3a8a43b6038df84a665aa8d8612 (diff)
parentde078ef55c74d02ee93d44513da5ee88a089d71d (diff)
downloadblackbird-obmc-linux-0d9df2515dbceb67d343c0f10fd3ff218380d524.tar.gz
blackbird-obmc-linux-0d9df2515dbceb67d343c0f10fd3ff218380d524.zip
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
-rw-r--r--arch/alpha/kernel/vmlinux.lds.S1
-rw-r--r--arch/mips/kernel/Makefile2
-rw-r--r--arch/mips/kernel/vmlinux.lds.S12
3 files changed, 9 insertions, 6 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 2906665b1c10..ecf4d488333d 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -1,4 +1,5 @@
#include <asm-generic/vmlinux.lds.h>
+#include <asm/thread_info.h>
#include <asm/page.h>
#include <asm/thread_info.h>
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
{
OpenPOWER on IntegriCloud