linux-kernel - linux-next: manual merge of the tip tree with the sh tree

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>] [day] [month] [year] [list]

Message-Id: <20101014131953.cc24b95d.sfr@canb.auug.org.au>
Date:	Thu, 14 Oct 2010 13:19:53 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the tip tree with the sh tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/sh/kernel/perf_event.c between commit
51c6c9bb34fcd112d4ab8b8f5c1d1b6a10a00e71 ("sh: perf: Set up
perf_max_events") from the sh tree and commit
a4eaf7f14675cb512d69f0c928055e73d0c6d252 ("perf: Rework the PMU methods")
from the tip tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/sh/kernel/perf_event.c
index ecef1fe,036f7a9..0000000
--- a/arch/sh/kernel/perf_event.c
+++ b/arch/sh/kernel/perf_event.c
@@@ -319,13 -365,13 +365,14 @@@ int __cpuinit register_sh_pmu(struct sh
  {
  	if (sh_pmu)
  		return -EBUSY;
- 	sh_pmu = pmu;
+ 	sh_pmu = _pmu;
  
- 	pr_info("Performance Events: %s support registered\n", pmu->name);
+ 	pr_info("Performance Events: %s support registered\n", _pmu->name);
  
- 	WARN_ON(pmu->num_events > MAX_HWEVENTS);
- 	perf_max_events = pmu->num_events;
+ 	WARN_ON(_pmu->num_events > MAX_HWEVENTS);
++	perf_max_events = _pmu->num_events;
  
+ 	perf_pmu_register(&pmu);
  	perf_cpu_notifier(sh_pmu_notifier);
  	return 0;
  }
--
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/