[arch-commits] Commit in kernel26-lts/trunk (PKGBUILD revert-perf.patch)

[Tobias Powalowski]

    Date: Thursday, March 24, 2011 @ 10:43:07
  Author: tpowa
Revision: 116654

upgpkg: kernel26-lts 2.6.32.34-1
bump to latest version

Added:
  kernel26-lts/trunk/revert-perf.patch
Modified:
  kernel26-lts/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   11 ++++++++---
 revert-perf.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-24 13:46:05 UTC (rev 116653)
+++ PKGBUILD	2011-03-24 14:43:07 UTC (rev 116654)
@@ -5,22 +5,25 @@
 pkgname=('kernel26-lts' 'kernel26-lts-headers') # Build stock -lts kernel
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.32
-pkgver=${_basekernel}.33
-pkgrel=2
+pkgver=${_basekernel}.34
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.kernel.org"
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/patch-$pkgver.bz2
         libata-alignment.patch
+        # broken 2.6.32.34 patch
+        revert-perf.patch
 	# the main kernel config files
         config config.x86_64
         # standard config files for mkinitcpio ramdisk
         ${pkgname}.preset)
 options=(!strip)
 md5sums=('260551284ac224c3a43c4adac7df4879'
-         'dacbfe6cf0711e9a9fd0d139b8ad4f8a'
+         'f84f7b7a1529c95809e2eef3c4759dbd'
          '30851deee235a7486bd408cbe8eb2d71'
+         '825a77c795c4e262575bf3669e1e73f0'
          'c0bd6a068a32636e52bf4d887bb2b722'
          'a5a3af2b95f9a8b3c43d1a74fa5fd82c'
          '2cbfeb3e2a18d45f82f613e97fc23355')
@@ -34,6 +37,8 @@
 
   # fix 22343 udev crashes
   patch -Np1 -i ${srcdir}/libata-alignment.patch
+  # revert broken patch from 2.6.32.34
+  patch -Rp1 -i ${srcdir}/revert-perf.patch
 
   if [ "$CARCH" = "x86_64" ]; then
     cat ../config.x86_64 >./.config

Added: revert-perf.patch
===================================================================
--- revert-perf.patch	                        (rev 0)
+++ revert-perf.patch	2011-03-24 14:43:07 UTC (rev 116654)
@@ -0,0 +1,37 @@
+From: Frederic Weisbecker <fweisbec at gmail.com>
+Date: Mon, 7 Mar 2011 20:27:09 +0000 (+0100)
+Subject: perf: Handle stopped state with tracepoints
+X-Git-Tag: v2.6.32.34~16
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flongterm%2Flinux-2.6.32.y.git;a=commitdiff_plain;h=6f197b73304b3bd3d5a43b931383a5331d6b2987
+
+perf: Handle stopped state with tracepoints
+
+commit a0f7d0f7fc02465bb9758501f611f63381792996 upstream.
+
+We toggle the state from start and stop callbacks but actually
+don't check it when the event triggers. Do it so that
+these callbacks actually work.
+
+Signed-off-by: Frederic Weisbecker <fweisbec at gmail.com>
+Cc: Arnaldo Carvalho de Melo <acme at redhat.com>
+Cc: Paul Mackerras <paulus at samba.org>
+Cc: Stephane Eranian <eranian at google.com>
+Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
+LKML-Reference: <1299529629-18280-2-git-send-email-fweisbec at gmail.com>
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+
+diff --git a/kernel/perf_event.c b/kernel/perf_event.c
+index 183d437..f9af60f 100644
+--- a/kernel/perf_event.c
++++ b/kernel/perf_event.c
+@@ -4167,6 +4167,8 @@ static void tp_perf_event_destroy(struct perf_event *event)
+ 
+ static const struct pmu *tp_perf_event_init(struct perf_event *event)
+ {
++	if (event->hw.state & PERF_HES_STOPPED)
++		return 0;
+ 	/*
+ 	 * Raw tracepoint data is a severe data leak, only allow root to
+ 	 * have these.