From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 01:53:17 +0000 (+1000)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=d0b40e192946f703e2d24577578eeef9499c10a6

Merge remote-tracking branch 'tip/auto-latest'
---

d0b40e192946f703e2d24577578eeef9499c10a6
diff --cc arch/x86/lib/memcpy_64.S
index 94c917af9688,49e6ebac7e73..779782f58324
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@@ -276,8 -273,7 +276,8 @@@ ENTRY(memcpy_mcsafe_unrolled
  .L_done_memcpy_trap:
  	xorq %rax, %rax
  	ret
- ENDPROC(memcpy_mcsafe)
- EXPORT_SYMBOL_GPL(memcpy_mcsafe)
+ ENDPROC(memcpy_mcsafe_unrolled)
++EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled)
  
  	.section .fixup, "ax"
  	/* Return -EFAULT for any failure */
diff --cc include/linux/jump_label.h
index a534c7f15a61,595fb46213fc..a0547c571800
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@@ -272,16 -273,9 +275,19 @@@ struct static_key_false 
  #define DEFINE_STATIC_KEY_FALSE(name)	\
  	struct static_key_false name = STATIC_KEY_FALSE_INIT
  
+ #define DECLARE_STATIC_KEY_FALSE(name)	\
+ 	extern struct static_key_false name
+ 
 +#define DEFINE_STATIC_KEY_ARRAY_TRUE(name, count)		\
 +	struct static_key_true name[count] = {			\
 +		[0 ... (count) - 1] = STATIC_KEY_TRUE_INIT,	\
 +	}
 +
 +#define DEFINE_STATIC_KEY_ARRAY_FALSE(name, count)		\
 +	struct static_key_false name[count] = {			\
 +		[0 ... (count) - 1] = STATIC_KEY_FALSE_INIT,	\
 +	}
 +
  extern bool ____wrong_branch_error(void);
  
  #define static_key_enabled(x)							\
diff --cc include/linux/perf/arm_pmu.h
index dc1f2f30c961,4ad1b408c0bb..05d46ddb6f56
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@@ -116,10 -109,8 +116,10 @@@ struct arm_pmu 
  	DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);
  	struct platform_device	*plat_device;
  	struct pmu_hw_events	__percpu *hw_events;
- 	struct list_head	entry;
+ 	struct hlist_node	node;
  	struct notifier_block	cpu_pm_nb;
 +	/* the attr_groups array must be NULL-terminated */
 +	const struct attribute_group *attr_groups[ARMPMU_NR_ATTR_GROUPS + 1];
  };
  
  #define to_arm_pmu(p) (container_of(p, struct arm_pmu, pmu))