[kernel] r17114 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all/stable patches/series

[Ben Hutchings]

Author: benh
Date: Fri Mar 25 02:51:42 2011
New Revision: 17114

Log:
Add longterm release 2.6.32.35 (fixup for .34)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.35.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/32

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Mar 25 02:49:54 2011	(r17113)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Mar 25 02:51:42 2011	(r17114)
@@ -27,7 +27,7 @@
   * Fix corrupted OSF partition table parsing (CVE-2011-1163)
   * xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
     (CVE-2011-0711)
-  * Add stable release 2.6.32.34:
+  * Add longterm release 2.6.32.34 and 2.6.32.35:
     - hwmon/f71882fg: Set platform drvdata to NULL later
     - mtd: add "platform:" prefix for platform modalias
     - libata: no special completion processing for EH commands
@@ -54,7 +54,6 @@
     - ALSA: ctxfi - Fix SPDIF status retrieval
     - ALSA: ctxfi - Clear input settings before initialization
     - SUNRPC: Ensure we always run the tk_callback before tk_action
-    - perf: Handle stopped state with tracepoints
     - perf, powerpc: Handle events that raise an exception without overflowing
     - ext3: Always set dx_node's fake_dirent explicitly.
     - call_function_many: fix list delete vs add race

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.35.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.35.patch	Fri Mar 25 02:51:42 2011	(r17114)
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index ca59a37..63fce32 100644
+diff --git a/kernel/perf_event.c b/kernel/perf_event.c
+index f9af60f..183d437 100644
+--- a/kernel/perf_event.c
++++ b/kernel/perf_event.c
+@@ -4167,8 +4167,6 @@ 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.

Modified: dists/squeeze/linux-2.6/debian/patches/series/32
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/32	Fri Mar 25 02:49:54 2011	(r17113)
+++ dists/squeeze/linux-2.6/debian/patches/series/32	Fri Mar 25 02:51:42 2011	(r17114)
@@ -9,3 +9,4 @@
 + bugfix/all/increase-osf-partition-limit-from-8-to-18.patch
 + bugfix/all/xfs-prevent-leaking-uninitialized-stack-memory-in-FSGEOMETRY_V1.patch
 + bugfix/all/stable/2.6.32.34.patch
++ bugfix/all/stable/2.6.32.35.patch