[kernel/f15] Work around #663080 on s390x and restore building perf there.

[Kyle McMartin]

commit a770668d850105eeb6a702ddcd2239a0b42b94f8
Author: Kyle McMartin <kyle at redhat.com>
Date:   Wed Nov 16 11:23:44 2011 -0500

    Work around #663080 on s390x and restore building perf there.

 kernel.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 703893c..d9ff491 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -304,7 +304,6 @@ Summary: The Linux kernel
 %define image_install_path boot
 %define make_target image
 %define kernel_image arch/s390/boot/image
-%define with_perf 0
 %endif
 
 %ifarch sparc64
@@ -1582,7 +1581,7 @@ BuildKernel %make_target %kernel_image smp
 %global perf_make \
   make %{?_smp_mflags} -C tools/perf -s V=1 HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix}
 %if %{with_perf}
-%{perf_make} all
+%{perf_make} EXTRA_CFLAGS="-Wno-error=array-bounds" all
 %{perf_make} man || %{doc_build_fail}
 %endif
 
@@ -1886,6 +1885,9 @@ fi
 # and build.
 
 %changelog
+* Wed Nov 16 2011 Kyle McMartin <kmcmartin at redhat.com>
+- Work around #663080 on s390x and restore building perf there.
+
 * Tue Nov 15 2011 Dave Jones <davej at redhat.com>
 - mm: Do not stall in synchronous compaction for THP allocations