tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 0d9df251 cce1d9f2

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