aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
1#include <asm-generic/vmlinux.lds.h> 1#include <asm-generic/vmlinux.lds.h>
2#include <asm/thread_info.h>
2#include <asm/page.h> 3#include <asm/page.h>
3#include <asm/thread_info.h> 4#include <asm/thread_info.h>
4 5
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 @@
2# Makefile for the Linux/MIPS kernel. 2# Makefile for the Linux/MIPS kernel.
3# 3#
4 4
5CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS)
6
5extra-y := head.o init_task.o vmlinux.lds 7extra-y := head.o init_task.o vmlinux.lds
6 8
7obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \ 9obj-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 {
11 note PT_NOTE FLAGS(4); /* R__ */ 11 note PT_NOTE FLAGS(4); /* R__ */
12} 12}
13 13
14ifdef CONFIG_32BIT 14#ifdef CONFIG_32BIT
15 ifdef CONFIG_CPU_LITTLE_ENDIAN 15 #ifdef CONFIG_CPU_LITTLE_ENDIAN
16 jiffies = jiffies_64; 16 jiffies = jiffies_64;
17 else 17 #else
18 jiffies = jiffies_64 + 4; 18 jiffies = jiffies_64 + 4;
19 endif 19 #endif
20else 20#else
21 jiffies = jiffies_64; 21 jiffies = jiffies_64;
22endif 22#endif
23 23
24SECTIONS 24SECTIONS
25{ 25{