linux-kernel - [tip:perf/core] perf, sh: Fix patch merge foul-up

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 15 Sep 2010 10:02:42 GMT
From:	tip-bot for Matt Fleming <matt@...sole-pimps.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	a.p.zijlstra@...llo.nl, matt@...sole-pimps.org, tglx@...utronix.de,
	mingo@...e.hu
Subject: [tip:perf/core] perf, sh: Fix patch merge foul-up

Commit-ID:  64a48d90149bb7007275fac13eaa4cb8d8ce12ea
Gitweb:     http://git.kernel.org/tip/64a48d90149bb7007275fac13eaa4cb8d8ce12ea
Author:     Matt Fleming <matt@...sole-pimps.org>
AuthorDate: Mon, 13 Sep 2010 20:17:29 +0100
Committer:  Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 15 Sep 2010 10:43:59 +0200

perf, sh: Fix patch merge foul-up

3f6da390 ("perf: Rework and fix the arch CPU-hotplug hooks") introduced
this breakage. sh_pmu_setup() is missing an opening curly brace.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
LKML-Reference: <20100913191729.GA6440@...sole-pimps.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 arch/sh/kernel/perf_event.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c
index cf39c48..036f7a9 100644
--- a/arch/sh/kernel/perf_event.c
+++ b/arch/sh/kernel/perf_event.c
@@ -338,7 +338,7 @@ static struct pmu pmu = {
 };
 
 static void sh_pmu_setup(int cpu)
-
+{
 	struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
 
 	memset(cpuhw, 0, sizeof(struct cpu_hw_events));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/