Merge remote branch 'rmk/for-linus' into for-linus

* rmk/for-linus: (1557 commits)
  ARM: 6806/1: irq: introduce entry and exit functions for chained handlers
  ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas
  ARM: 6747/1: P2V: Thumb2 support
  ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
  ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode
  ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9
  ARM: 6772/1: errata: possible fault MMU translations following an ASID switch
  ARM: 6776/1: mach-ux500: activate fix for errata 753970
  ARM: 6794/1: SPEAr: Append UL to device address macros.
  ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files
  ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
  ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code
  ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
  ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci
  ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
  ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
  ARM: 6681/1: SPEAr: add debugfs support to clk API
  ARM: 6703/1: SPEAr: update clk API support
  ARM: 6679/1: SPEAr: make clk API functions more generic
  ARM: 6737/1: SPEAr: formalized timer support
  ...

Conflicts:
	arch/arm/mach-msm/board-msm7x27.c
	arch/arm/mach-msm/board-msm7x30.c
	arch/arm/mach-msm/board-qsd8x50.c
	arch/arm/mach-msm/board-sapphire.c
	arch/arm/mach-msm/include/mach/memory.h

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/perf/util/values.c b/tools/perf/util/values.c
index cfa55d686e3b..bdd33470b235 100644
--- a/tools/perf/util/values.c
+++ b/tools/perf/util/values.c
@@ -150,7 +150,7 @@ static void perf_read_values__display_pretty(FILE *fp,
                 if (width > tidwidth)
                         tidwidth = width;
                 for (j = 0; j < values->counters; j++) {
-                        width = snprintf(NULL, 0, "%Lu", values->value[i][j]);
+                        width = snprintf(NULL, 0, "%" PRIu64, values->value[i][j]);
                         if (width > counterwidth[j])
                                 counterwidth[j] = width;
                 }
@@ -165,7 +165,7 @@ static void perf_read_values__display_pretty(FILE *fp,
                 fprintf(fp, "  %*d  %*d", pidwidth, values->pid[i],
                         tidwidth, values->tid[i]);
                 for (j = 0; j < values->counters; j++)
-                        fprintf(fp, "  %*Lu",
+                        fprintf(fp, "  %*" PRIu64,
                                 counterwidth[j], values->value[i][j]);
                 fprintf(fp, "\n");
         }
@@ -196,13 +196,13 @@ static void perf_read_values__display_raw(FILE *fp,
                 width = strlen(values->countername[j]);
                 if (width > namewidth)
                         namewidth = width;
-                width = snprintf(NULL, 0, "%llx", values->counterrawid[j]);
+                width = snprintf(NULL, 0, "%" PRIx64, values->counterrawid[j]);
                 if (width > rawwidth)
                         rawwidth = width;
         }
         for (i = 0; i < values->threads; i++) {
                 for (j = 0; j < values->counters; j++) {
-                        width = snprintf(NULL, 0, "%Lu", values->value[i][j]);
+                        width = snprintf(NULL, 0, "%" PRIu64, values->value[i][j]);
                         if (width > countwidth)
                                 countwidth = width;
                 }
@@ -214,7 +214,7 @@ static void perf_read_values__display_raw(FILE *fp,
                 countwidth, "Count");
         for (i = 0; i < values->threads; i++)
                 for (j = 0; j < values->counters; j++)
-                        fprintf(fp, "  %*d  %*d  %*s  %*llx  %*Lu\n",
+                        fprintf(fp, "  %*d  %*d  %*s  %*" PRIx64 "  %*" PRIu64,
                                 pidwidth, values->pid[i],
                                 tidwidth, values->tid[i],
                                 namewidth, values->countername[j],