.38 patches

diff --git a/queue-2.6.38/perf-tool-fix-gcc-4.6.0-issues.patch b/queue-2.6.38/perf-tool-fix-gcc-4.6.0-issues.patch
new file mode 100644 (file)
index 0000000..074f6ed
--- /dev/null
+++ b/queue-2.6.38/perf-tool-fix-gcc-4.6.0-issues.patch
@@ -0,0 +1,208 @@
+From fb7d0b3cefb80a105f7fd26bbc62e0cbf9192822 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@mcmartin.ca>
+Date: Mon, 24 Jan 2011 11:13:04 -0500
+Subject: perf tool: Fix gcc 4.6.0 issues
+
+From: Kyle McMartin <kyle@mcmartin.ca>
+
+commit fb7d0b3cefb80a105f7fd26bbc62e0cbf9192822 upstream.
+
+GCC 4.6.0 in Fedora rawhide turned up some compile errors in tools/perf
+due to the -Werror=unused-but-set-variable flag.
+
+I've gone through and annotated some of the assignments that had side
+effects (ie: return value from a function) with the __used annotation,
+and in some cases, just removed unused code.
+
+In a few cases, we were assigning something useful, but not using it in
+later parts of the function.
+
+kyle@dreadnought:~/src% gcc --version
+gcc (GCC) 4.6.0 20110122 (Red Hat 4.6.0-0.3)
+
+Cc: Ingo Molnar <mingo@redhat.com>
+LKML-Reference: <20110124161304.GK27353@bombadil.infradead.org>
+Signed-off-by: Kyle McMartin <kyle@redhat.com>
+[ committer note: Fixed up the annotation fixes, as that code moved recently ]
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+[Backported to 2.6.38.2 by deleting unused but set variables]
+Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ tools/perf/bench/sched-pipe.c                          |    2 +-
+ tools/perf/builtin-sched.c                             |   12 +++---------
+ tools/perf/builtin-top.c                               |    5 +----
+ tools/perf/util/header.c                               |    2 +-
+ tools/perf/util/hist.c                                 |    3 ---
+ tools/perf/util/scripting-engines/trace-event-python.c |    3 +--
+ tools/perf/util/symbol.c                               |    4 ++--
+ tools/perf/util/trace-event-parse.c                    |    2 +-
+ tools/perf/util/ui/browsers/map.c                      |    2 +-
+ 9 files changed, 11 insertions(+), 24 deletions(-)
+
+--- a/tools/perf/bench/sched-pipe.c
++++ b/tools/perf/bench/sched-pipe.c
+@@ -55,7 +55,7 @@ int bench_sched_pipe(int argc, const cha
+        * discarding returned value of read(), write()
+        * causes error in building environment for perf
+        */
+-      int ret, wait_stat;
++      int __used ret, wait_stat;
+       pid_t pid, retpid;
+ 
+       argc = parse_options(argc, argv, options,
+--- a/tools/perf/builtin-sched.c
++++ b/tools/perf/builtin-sched.c
+@@ -369,11 +369,6 @@ static void
+ process_sched_event(struct task_desc *this_task __used, struct sched_atom *atom)
+ {
+       int ret = 0;
+-      u64 now;
+-      long long delta;
+-
+-      now = get_nsecs();
+-      delta = start_time + atom->timestamp - now;
+ 
+       switch (atom->type) {
+               case SCHED_EVENT_RUN:
+@@ -562,7 +557,7 @@ static void wait_for_tasks(void)
+ 
+ static void run_one_test(void)
+ {
+-      u64 T0, T1, delta, avg_delta, fluct, std_dev;
++      u64 T0, T1, delta, avg_delta, fluct;
+ 
+       T0 = get_nsecs();
+       wait_for_tasks();
+@@ -578,7 +573,6 @@ static void run_one_test(void)
+       else
+               fluct = delta - avg_delta;
+       sum_fluct += fluct;
+-      std_dev = sum_fluct / nr_runs / sqrt(nr_runs);
+       if (!run_avg)
+               run_avg = delta;
+       run_avg = (run_avg*9 + delta)/10;
+@@ -799,7 +793,7 @@ replay_switch_event(struct trace_switch_
+                   u64 timestamp,
+                   struct thread *thread __used)
+ {
+-      struct task_desc *prev, *next;
++      struct task_desc *prev, __used *next;
+       u64 timestamp0;
+       s64 delta;
+ 
+@@ -1404,7 +1398,7 @@ map_switch_event(struct trace_switch_eve
+                u64 timestamp,
+                struct thread *thread __used)
+ {
+-      struct thread *sched_out, *sched_in;
++      struct thread *sched_out __used, *sched_in;
+       int new_shortname;
+       u64 timestamp0;
+       s64 delta;
+--- a/tools/perf/builtin-top.c
++++ b/tools/perf/builtin-top.c
+@@ -183,7 +183,6 @@ static int parse_source(struct sym_entry
+       FILE *file;
+       char command[PATH_MAX*2];
+       const char *path;
+-      u64 len;
+ 
+       if (!syme)
+               return -1;
+@@ -212,8 +211,6 @@ static int parse_source(struct sym_entry
+       }
+       path = map->dso->long_name;
+ 
+-      len = sym->end - sym->start;
+-
+       sprintf(command,
+               "objdump --start-address=%#0*" PRIx64 " --stop-address=%#0*" PRIx64 " -dS %s",
+               BITS_PER_LONG / 4, map__rip_2objdump(map, sym->start),
+@@ -1296,7 +1293,7 @@ static int __cmd_top(void)
+ {
+       pthread_t thread;
+       struct perf_evsel *counter;
+-      int i, ret;
++      int i, ret __used;
+       /*
+        * FIXME: perf_session__new should allow passing a O_MMAP, so that all this
+        * mmap reading, etc is encapsulated in it. Use O_WRONLY for now.
+--- a/tools/perf/util/header.c
++++ b/tools/perf/util/header.c
+@@ -1144,7 +1144,7 @@ int event__synthesize_tracing_data(int f
+ {
+       event_t ev;
+       ssize_t size = 0, aligned_size = 0, padding;
+-      int err = 0;
++      int err __used = 0;
+ 
+       memset(&ev, 0, sizeof(ev));
+ 
+--- a/tools/perf/util/hist.c
++++ b/tools/perf/util/hist.c
+@@ -1095,7 +1095,6 @@ int hist_entry__annotate(struct hist_ent
+       char command[PATH_MAX * 2];
+       FILE *file;
+       int err = 0;
+-      u64 len;
+       char symfs_filename[PATH_MAX];
+ 
+       if (filename) {
+@@ -1140,8 +1139,6 @@ fallback:
+                filename, sym->name, map->unmap_ip(map, sym->start),
+                map->unmap_ip(map, sym->end));
+ 
+-      len = sym->end - sym->start;
+-
+       pr_debug("annotating [%p] %30s : [%p] %30s\n",
+                dso, dso->long_name, sym, sym->name);
+ 
+--- a/tools/perf/util/scripting-engines/trace-event-python.c
++++ b/tools/perf/util/scripting-engines/trace-event-python.c
+@@ -248,8 +248,7 @@ static void python_process_event(int cpu
+       context = PyCObject_FromVoidPtr(scripting_context, NULL);
+ 
+       PyTuple_SetItem(t, n++, PyString_FromString(handler_name));
+-      PyTuple_SetItem(t, n++,
+-                      PyCObject_FromVoidPtr(scripting_context, NULL));
++      PyTuple_SetItem(t, n++, context);
+ 
+       if (handler) {
+               PyTuple_SetItem(t, n++, PyInt_FromLong(cpu));
+--- a/tools/perf/util/symbol.c
++++ b/tools/perf/util/symbol.c
+@@ -1525,8 +1525,8 @@ int dso__load(struct dso *self, struct m
+                            symbol_conf.symfs, self->long_name);
+                       break;
+               case DSO__ORIG_GUEST_KMODULE:
+-                      if (map->groups && map->groups->machine)
+-                              root_dir = map->groups->machine->root_dir;
++                      if (map->groups && machine)
++                              root_dir = machine->root_dir;
+                       else
+                               root_dir = "";
+                       snprintf(name, size, "%s%s%s", symbol_conf.symfs,
+--- a/tools/perf/util/trace-event-parse.c
++++ b/tools/perf/util/trace-event-parse.c
+@@ -153,7 +153,7 @@ void parse_proc_kallsyms(char *file, uns
+       char *next = NULL;
+       char *addr_str;
+       char ch;
+-      int ret;
++      int ret __used;
+       int i;
+ 
+       line = strtok_r(file, "\n", &next);
+--- a/tools/perf/util/ui/browsers/map.c
++++ b/tools/perf/util/ui/browsers/map.c
+@@ -41,7 +41,7 @@ static int ui_entry__read(const char *ti
+ out_free_form:
+       newtPopWindow();
+       newtFormDestroy(form);
+-      return 0;
++      return err;
+ }
+ 
+ struct map_browser {

diff --git a/queue-2.6.38/series b/queue-2.6.38/series
index 4909e95f720e51af99f6d7624b8318dcfbe76537..c2ffd3d34a662638620c96833d00412b8fc6141a 100644 (file)
--- a/queue-2.6.38/series
+++ b/queue-2.6.38/series
@@ -67,3 +67,4 @@ usb-xhci-also-free-streams-when-resetting-devices.patch
 usb-fix-unplug-of-device-with-active-streams.patch
 radeon-fix-kms-cp-writeback-on-big-endian-machines.patch
 bluetooth-fix-hci_reset-command-synchronization.patch
+perf-tool-fix-gcc-4.6.0-issues.patch