[kernel] Fix perf build on ARM (from Kyle McMartin)

[Josh Boyer]

commit d5a4efb50adef352b7dde6079d5df07042f2d248
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Thu Sep 5 10:43:44 2013 -0400

    Fix perf build on ARM (from Kyle McMartin)

 kernel.spec        |    7 +++++++
 perf-arm-fix.patch |   24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0ff22bf..92dbccb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -776,6 +776,8 @@ Patch25077: media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020
 #CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
 Patch25099: HID-CVE-fixes.patch
 
+Patch25100: perf-arm-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1510,6 +1512,8 @@ ApplyPatch media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.
 #CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
 ApplyPatch HID-CVE-fixes.patch
 
+ApplyPatch perf-arm-fix.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2312,6 +2316,9 @@ fi
 #                                    ||     ||
 %changelog
 * Thu Sep 05 2013 Josh Boyer <jwboyer at fedoraproject.org> - 3.12.0-0.rc0.git11.1
+- Fix perf build on ARM (from Kyle McMartin)
+
+* Thu Sep 05 2013 Josh Boyer <jwboyer at fedoraproject.org>
 - Linux v3.11-3891-gae7a835
 
 * Thu Sep 05 2013 Josh Boyer <jwboyer at fedoraproject.org> - 3.12.0-0.rc0.git10.1
diff --git a/perf-arm-fix.patch b/perf-arm-fix.patch
new file mode 100644
index 0000000..795c20e
--- /dev/null
+++ b/perf-arm-fix.patch
@@ -0,0 +1,24 @@
+From: Kyle McMartin <kyle at redhat.com>
+
+MAP_32BIT is defined only on x86... this means perf fails to build on
+all other platforms.
+
+Signed-off-by: Kyle McMartin <kyle at redhat.com>
+
+--- a/tools/perf/builtin-trace.c
++++ b/tools/perf/builtin-trace.c
+@@ -100,7 +100,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,
+ 
+ 	P_MMAP_FLAG(SHARED);
+ 	P_MMAP_FLAG(PRIVATE);
++#ifdef MAP_32BIT
+ 	P_MMAP_FLAG(32BIT);
++#endif
+ 	P_MMAP_FLAG(ANONYMOUS);
+ 	P_MMAP_FLAG(DENYWRITE);
+ 	P_MMAP_FLAG(EXECUTABLE);
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
\ No newline at end of file