Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mips_5.14_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer:
- fix for accesing gic via vdso
- two build fixes
* tag 'mips_5.14_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: vdso: Invalid GIC access through VDSO
mips: disable branch profiling in boot/decompress.o
mips: always link byteswap helpers into decompressor
+5
-3
+2
-2
arch/mips/boot/compressed/Makefile
+2
-2
arch/mips/boot/compressed/Makefile
···
40
40
UBSAN_SANITIZE := n
41
41
42
42
# decompressor objects (linked with vmlinuz)
43
-
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o
43
+
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o $(obj)/bswapsi.o
44
44
45
45
ifdef CONFIG_DEBUG_ZBOOT
46
46
vmlinuzobjs-$(CONFIG_DEBUG_ZBOOT) += $(obj)/dbg.o
···
54
54
$(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c
55
55
$(call cmd,shipped)
56
56
57
-
vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o $(obj)/bswapsi.o
57
+
vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o
58
58
59
59
extra-y += ashldi3.c
60
60
$(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE
+2
arch/mips/boot/compressed/decompress.c
+2
arch/mips/boot/compressed/decompress.c
+1
-1
arch/mips/include/asm/vdso/vdso.h
+1
-1
arch/mips/include/asm/vdso/vdso.h