fix build failure on vmlinux.lds with 2.6.31 (#6052)
[openwrt/staging/chunkeey.git] / target / linux / generic-2.6 / patches-2.6.31 / 032-mips_vmlinux_lds.patch
1 diff -Nru linux-2.6.31.5/arch/mips/kernel/Makefile linux-2.6.31.5.new/arch/mips/kernel/Makefile
2 --- linux-2.6.31.5/arch/mips/kernel/Makefile 2009-10-25 12:35:46.137368384 +0200
3 +++ linux-2.6.31.5.new/arch/mips/kernel/Makefile 2009-10-25 15:24:04.713493469 +0200
4 @@ -2,6 +2,8 @@
5 # Makefile for the Linux/MIPS kernel.
6 #
7
8 +CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS) $(EXTRA_LDSFLAGS)
9 +
10 extra-y := head.o init_task.o vmlinux.lds
11
12 obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
13 diff -Nru linux-2.6.31.5/arch/mips/kernel/vmlinux.lds.S linux-2.6.31.5.new/arch/mips/kernel/vmlinux.lds.S
14 --- linux-2.6.31.5/arch/mips/kernel/vmlinux.lds.S 2009-10-23 01:57:56.000000000 +0300
15 +++ linux-2.6.31.5.new/arch/mips/kernel/vmlinux.lds.S 2009-10-25 15:26:11.631618513 +0200
16 @@ -10,15 +10,15 @@
17 note PT_NOTE FLAGS(4); /* R__ */
18 }
19
20 -ifdef CONFIG_32BIT
21 - ifdef CONFIG_CPU_LITTLE_ENDIAN
22 +#ifdef CONFIG_32BIT
23 + #ifdef CONFIG_CPU_LITTLE_ENDIAN
24 jiffies = jiffies_64;
25 - else
26 + #else
27 jiffies = jiffies_64 + 4;
28 - endif
29 -else
30 + #endif
31 +#else
32 jiffies = jiffies_64;
33 -endif
34 +#endif
35
36 SECTIONS
37 {