Commit 379cf80a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents af4cf6a5 47ce8527

arch/mips/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ GCOV_PROFILE := n 
UBSAN_SANITIZE := n



# decompressor objects (linked with vmlinuz)

vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o

vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o $(obj)/bswapsi.o



ifdef CONFIG_DEBUG_ZBOOT

vmlinuzobjs-$(CONFIG_DEBUG_ZBOOT)		   += $(obj)/dbg.o
@@ -54,7 +54,7 @@ extra-y += uart-ath79.c 
$(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c

	$(call cmd,shipped)



vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o $(obj)/bswapsi.o

vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o



extra-y += ashldi3.c

$(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE

arch/mips/boot/compressed/decompress.c

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * Author: Wu Zhangjin <wuzhangjin@gmail.com>

 */



#define DISABLE_BRANCH_PROFILING



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/string.h>

arch/mips/include/asm/vdso/vdso.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static inline const struct vdso_data *get_vdso_data(void) 


static inline void __iomem *get_gic(const struct vdso_data *data)

{

	return (void __iomem *)data - PAGE_SIZE;

	return (void __iomem *)((unsigned long)data & PAGE_MASK) - PAGE_SIZE;

}



#endif /* CONFIG_CLKSRC_MIPS_GIC */