Commit e912bf2c authored Feb 25, 2018 by Linus Torvalds

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Thomas Gleixner:
 "A single commit which shuts up a bogus GCC-8 warning"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()

parents 9c897096 85c615eb

arch/x86/oprofile/nmi_int.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -460,7 +460,7 @@ static int nmi_setup(void)
		goto fail;

		for_each_possible_cpu(cpu) {
		if (!cpu)
		if (!IS_ENABLED(CONFIG_SMP) \|\| !cpu)
		continue;

		memcpy(per_cpu(cpu_msrs, cpu).counters,