Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:51:54 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:51:54 +0000 (10:51 -0700)
* 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

arch/alpha/kernel/vmlinux.lds.S
arch/mips/kernel/Makefile
arch/mips/kernel/vmlinux.lds.S

index 2906665b1c103199f1c660d34cc5b2027fb63243..ecf4d488333d1c19369de7c1cdfabb91dd36ded0 100644 (file)
@@ -1,4 +1,5 @@
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/thread_info.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
 
index e961221599284ece99bfb6be82bed065d7675d98..eecd2a9f155cf67d75f9409963caf339a1b3e1dd 100644 (file)
@@ -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 \
index 9bf0e3df7c5a6191e6d322c3a431b662d739b931..162b29954baaa804be135b28fbbe482e56b853d3 100644 (file)
@@ -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
 {