summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-04-18 06:58:29 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-04-18 06:58:29 -0400
commit4f60176946559ae67f6b3fc91e023aea42b5ae88 (patch)
tree32ef323db4fcebfc781c871770d7ba88df2977ac
parentec661e9846b5a7819fcd535257f9c49281515152 (diff)
downloadkernel-4f60176946559ae67f6b3fc91e023aea42b5ae88.tar.gz
kernel-4f60176946559ae67f6b3fc91e023aea42b5ae88.tar.xz
kernel-4f60176946559ae67f6b3fc91e023aea42b5ae88.zip
Linux v3.15-rc1-113-g6ca2a88ad820
- Build perf with unwind support via libdw (rhbz 1025603)
-rw-r--r--disable-libdw-unwind-on-non-x86.patch15
-rw-r--r--kernel.spec6
2 files changed, 21 insertions, 0 deletions
diff --git a/disable-libdw-unwind-on-non-x86.patch b/disable-libdw-unwind-on-non-x86.patch
new file mode 100644
index 000000000..445fc1942
--- /dev/null
+++ b/disable-libdw-unwind-on-non-x86.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
+index ee21fa9..19ee413 100644
+--- a/tools/perf/config/Makefile
++++ b/tools/perf/config/Makefile
+@@ -34,6 +34,10 @@ ifeq ($(ARCH),arm)
+ LIBUNWIND_LIBS = -lunwind -lunwind-arm
+ endif
+
++ifneq ($(ARCH),x86)
++ NO_LIBDW_DWARF_UNWIND := 1
++endif
++
+ ifeq ($(LIBUNWIND_LIBS),)
+ NO_LIBUNWIND := 1
+ else
diff --git a/kernel.spec b/kernel.spec
index 9f97857a1..3ad8677f9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -635,6 +635,9 @@ Patch25049: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
Patch25061: gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
Patch25062: gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
+#rhbz 1025603
+Patch25063: disable-libdw-unwind-on-non-x86.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1279,6 +1282,9 @@ ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
ApplyPatch gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
ApplyPatch gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
+#rhbz 1025603
+ApplyPatch disable-libdw-unwind-on-non-x86.patch
+
# END OF PATCH APPLICATIONS
%endif