Merge 2.6.38-rc5 into usb-next

This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

29 files changed, 255 insertions, 215 deletions

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 2b5387d53ba5..7141c42e1469 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -204,13 +204,11 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wshadow
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Winit-self
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wpacked
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wredundant-decls
-EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstack-protector
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-aliasing=3
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-default
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-enum
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wno-system-headers
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wundef
-EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wvolatile-register-var
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wwrite-strings
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wbad-function-cast
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wmissing-declarations
@@ -294,6 +292,13 @@ ifeq ($(call try-cc,$(SOURCE_HELLO),-Werror -fstack-protector-all),y)
         CFLAGS := $(CFLAGS) -fstack-protector-all
 endif
 
+ifeq ($(call try-cc,$(SOURCE_HELLO),-Werror -Wstack-protector),y)
+       CFLAGS := $(CFLAGS) -Wstack-protector
+endif
+
+ifeq ($(call try-cc,$(SOURCE_HELLO),-Werror -Wvolatile-register-var),y)
+       CFLAGS := $(CFLAGS) -Wvolatile-register-var
+endif
 
 ### --- END CONFIGURATION SECTION ---
 
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index c056cdc06912..8879463807e4 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -212,7 +212,7 @@ get_source_line(struct hist_entry *he, int len, const char *filename)
                         continue;
 
                 offset = start + i;
-                sprintf(cmd, "addr2line -e %s %016llx", filename, offset);
+                sprintf(cmd, "addr2line -e %s %016" PRIx64, filename, offset);
                 fp = popen(cmd, "r");
                 if (!fp)
                         continue;
@@ -270,9 +270,9 @@ static void hist_entry__print_hits(struct hist_entry *self)
 
         for (offset = 0; offset < len; ++offset)
                 if (h->ip[offset] != 0)
-                        printf("%*Lx: %Lu\n", BITS_PER_LONG / 2,
+                        printf("%*" PRIx64 ": %" PRIu64 "\n", BITS_PER_LONG / 2,
                                sym->start + offset, h->ip[offset]);
-        printf("%*s: %Lu\n", BITS_PER_LONG / 2, "h->sum", h->sum);
+        printf("%*s: %" PRIu64 "\n", BITS_PER_LONG / 2, "h->sum", h->sum);
 }
 
 static int hist_entry__tty_annotate(struct hist_entry *he)
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index def7ddc2fd4f..d97256d65980 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -371,10 +371,10 @@ static void __print_result(struct rb_root *root, struct perf_session *session,
                         addr = data->ptr;
 
                 if (sym != NULL)
-                        snprintf(buf, sizeof(buf), "%s+%Lx", sym->name,
+                        snprintf(buf, sizeof(buf), "%s+%" PRIx64 "", sym->name,
                                  addr - map->unmap_ip(map, sym->start));
                 else
-                        snprintf(buf, sizeof(buf), "%#Lx", addr);
+                        snprintf(buf, sizeof(buf), "%#" PRIx64 "", addr);
                 printf(" %-34s |", buf);
 
                 printf(" %9llu/%-5lu | %9llu/%-5lu | %8lu | %8lu | %6.3f%%\n",
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index b9c6e5432971..2b36defc5d73 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -782,9 +782,9 @@ static void print_result(void)
                 pr_info("%10u ", st->nr_acquired);
                 pr_info("%10u ", st->nr_contended);
 
-                pr_info("%15llu ", st->wait_time_total);
-                pr_info("%15llu ", st->wait_time_max);
-                pr_info("%15llu ", st->wait_time_min == ULLONG_MAX ?
+                pr_info("%15" PRIu64 " ", st->wait_time_total);
+                pr_info("%15" PRIu64 " ", st->wait_time_max);
+                pr_info("%15" PRIu64 " ", st->wait_time_min == ULLONG_MAX ?
                        0 : st->wait_time_min);
                 pr_info("\n");
         }
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index fcd29e8af29f..60cac6f92e8b 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -759,8 +759,8 @@ static int __cmd_record(int argc, const char **argv)
                 perf_session__process_machines(session, event__synthesize_guest_os);
 
         if (!system_wide)
-                event__synthesize_thread(target_tid, process_synthesized_event,
-                                         session);
+                event__synthesize_thread_map(threads, process_synthesized_event,
+                                             session);
         else
                 event__synthesize_threads(process_synthesized_event, session);
 
@@ -817,7 +817,7 @@ static int __cmd_record(int argc, const char **argv)
          * Approximate RIP event size: 24 bytes.
          */
         fprintf(stderr,
-                "[ perf record: Captured and wrote %.3f MB %s (~%lld samples) ]\n",
+                "[ perf record: Captured and wrote %.3f MB %s (~%" PRIu64 " samples) ]\n",
                 (double)bytes_written / 1024.0 / 1024.0,
                 output_name,
                 bytes_written / 24);
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 75183a4518e6..c27e31f289e6 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -197,7 +197,7 @@ static int process_read_event(event_t *event, struct sample_data *sample __used,
                                            event->read.value);
         }
 
-        dump_printf(": %d %d %s %Lu\n", event->read.pid, event->read.tid,
+        dump_printf(": %d %d %s %" PRIu64 "\n", event->read.pid, event->read.tid,
                     attr ? __event_name(attr->type, attr->config) : "FAIL",
                     event->read.value);