- fix for accesing gic via vdso

- two build fixes
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmDpjpwaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHBldw//fThtL09pNt3SfElnclT5
 wozVB0ViUtLRD26q4XAJjoMDb1M8GV3LaJ7AKu+BiwD8HLbIBZ1ZSZsqM/3lb9Ez
 /PusTuvzu06tH48IatRCwRWYnswT4RTiuyeFokDZaX2pWlbuW3L+z1JX7PUFi/0y
 ulu/4bAfj/5up/vNSr2HEHHpVT5vMNpUkpbQwxC+Oy5Nn+prVb4fqGa4YkJJj0f9
 YvzdJYJUp0u1p3YKd9EwfDIgA2KgwKUKp1sJahCkv88DjUv1UbESfMvPrKcB1yxn
 yd1hVcb4QgwslhDHKKVeIvPSp0yAndng/0TA3Fx8s1eXx07RohYI6QVQs+UbXPlV
 CTkoBxrvNT922w/5lUSsCu01NGaO43sxAzygetEjjLXVhbcjHvQiNYfNqqNzRcL1
 helTLMmI9Y4sj0PflqZenQwiwe/QJiWMvuVIibEst5o+eHccyqhD6ylmrGTqAZqw
 mEqBSLeKJw0TGuY/B+JD1hjiXVk2OYFL63Y9oNauj2U5bXP1K8Tpg5+u6TYZFN6d
 f4iO17/BmgZRisCbxAR2sGFP/hclquwAmxARnJ6/cSgOvl6P34qzIcnmqXVOn5g0
 CxA3pLoEm7BmyUTgpceWAFqlY650tpEYjeVW+glRcw9w2s0pAYyO7KVtXK32e7mX
 8TTNg2i9P+RJO/25f5k+Lq8=
 =Lk+H
 -----END PGP SIGNATURE-----

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

arch/mips/boot/compressed/Makefile

@@ -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

@@ -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

@@ -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 */