From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 May 2021 23:07:09 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm64/for-next/core'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=95e036140e3f2220e6da853efe59f09babfef2d1;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'arm64/for-next/core'

# Conflicts:
#	arch/arm64/kernel/alternative.c
---

95e036140e3f2220e6da853efe59f09babfef2d1
diff --cc arch/arm64/kernel/alternative.c
index abc84636af076,f6fd161850401..f6aa38436f56a
--- a/arch/arm64/kernel/alternative.c
+++ b/arch/arm64/kernel/alternative.c
@@@ -133,11 -133,10 +133,10 @@@ static void clean_dcache_range_nopatch(
  	} while (cur += d_size, cur < end);
  }
  
- static void __nocfi __apply_alternatives(void *alt_region,  bool is_module,
 -static void __apply_alternatives(struct alt_region *region, bool is_module,
 -				 unsigned long *feature_mask)
++static void __nocfi __apply_alternatives(struct alt_region *region, bool is_module,
 +					 unsigned long *feature_mask)
  {
  	struct alt_instr *alt;
- 	struct alt_region *region = alt_region;
  	__le32 *origptr, *updptr;
  	alternative_cb_t alt_cb;