Fix perf build on ARM (from Kyle McMartin)

This commit is contained in:
Josh Boyer 2013-09-05 10:43:44 -04:00
parent f55bd27d50
commit d5a4efb50a
2 changed files with 31 additions and 0 deletions

View File

@ -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 #CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
Patch25099: HID-CVE-fixes.patch Patch25099: HID-CVE-fixes.patch
Patch25100: perf-arm-fix.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
%endif %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 #CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
ApplyPatch HID-CVE-fixes.patch ApplyPatch HID-CVE-fixes.patch
ApplyPatch perf-arm-fix.patch
# END OF PATCH APPLICATIONS # END OF PATCH APPLICATIONS
%endif %endif
@ -2312,6 +2316,9 @@ fi
# || || # || ||
%changelog %changelog
* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git11.1 * Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git11.1
- Fix perf build on ARM (from Kyle McMartin)
* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org>
- Linux v3.11-3891-gae7a835 - Linux v3.11-3891-gae7a835
* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git10.1 * Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git10.1

24
perf-arm-fix.patch Normal file
View File

@ -0,0 +1,24 @@
From: Kyle McMartin <kyle@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@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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/