[kernel] r14157 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Fri Aug 21 14:42:58 2009
New Revision: 14157

Log:
Specify a fallback PERF_COUNTER_INDEX_OFFSET for archs that
don't define it

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/perf_counter-default-idx-offset.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Aug 21 12:31:01 2009	(r14156)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Aug 21 14:42:58 2009	(r14157)
@@ -75,6 +75,8 @@
   * n_tty: Fix echo race
   * [ia64] Stop disabling CONFIG_HOTPLUG_CPU, which was blocking
     CONFIG_KEXEC from being enabled
+  * Specify a fallback PERF_COUNTER_INDEX_OFFSET for archs that
+    don't define it
 
  -- maximilian attems <maks at debian.org>  Thu, 18 Jun 2009 23:50:56 +0200
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/perf_counter-default-idx-offset.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/perf_counter-default-idx-offset.patch	Fri Aug 21 14:42:58 2009	(r14157)
@@ -0,0 +1,48 @@
+commit f738eb1b63edf664da1b4ac76895d988749b2f07
+Author: Ingo Molnar <mingo at elte.hu>
+Date:   Tue Aug 18 11:32:24 2009 +0200
+
+    perf_counter: Fix the PARISC build
+    
+    PARISC does not build:
+    
+    /home/mingo/tip/kernel/perf_counter.c: In function 'perf_counter_index':
+    /home/mingo/tip/kernel/perf_counter.c:2016: error: 'PERF_COUNTER_INDEX_OFFSET' undeclared (first use in this function)
+    /home/mingo/tip/kernel/perf_counter.c:2016: error: (Each undeclared identifier is reported only once
+    /home/mingo/tip/kernel/perf_counter.c:2016: error: for each function it appears in.)
+    
+    As PERF_COUNTER_INDEX_OFFSET is not defined.
+    
+    Now, we could define it in the architecture - but lets also provide
+    a core default of 0 (which happens to be what all but one
+    architecture uses at the moment).
+    
+    Architectures that need a different index offset should set this
+    value in their asm/perf_counter.h files.
+    
+    Cc: Kyle McMartin <kyle at mcmartin.ca>
+    Cc: Helge Deller <deller at gmx.de>
+    Cc: linux-parisc at vger.kernel.org
+    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
+    Cc: Mike Galbraith <efault at gmx.de>
+    Cc: Paul Mackerras <paulus at samba.org>
+    Cc: Arnaldo Carvalho de Melo <acme at redhat.com>
+    Cc: Frederic Weisbecker <fweisbec at gmail.com>
+    LKML-Reference: <new-submission>
+    Signed-off-by: Ingo Molnar <mingo at elte.hu>
+
+diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
+index b8fe739..36f65e2 100644
+--- a/kernel/perf_counter.c
++++ b/kernel/perf_counter.c
+@@ -2019,6 +2019,10 @@ int perf_counter_task_disable(void)
+ 	return 0;
+ }
+ 
++#ifndef PERF_COUNTER_INDEX_OFFSET
++# define PERF_COUNTER_INDEX_OFFSET 0
++#endif
++
+ static int perf_counter_index(struct perf_counter *counter)
+ {
+ 	if (counter->state != PERF_COUNTER_STATE_ACTIVE)

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Aug 21 12:31:01 2009	(r14156)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Aug 21 14:42:58 2009	(r14157)
@@ -29,3 +29,4 @@
 #+ bugfix/all/wireless-regulatory-default-EU.patch
 #+ features/sparc/video-sunxvr500-intergraph.patch
 #+ bugfix/sparc/arch-zimage-target.patch
++ bugfix/all/perf_counter-default-idx-offset.patch