Patch "perf dwarf: Guard !x86_64 definitions under #ifdef else clause" has been added to the 4.4-stable tree

[<gregkh@linuxfoundation.org>]

This is a note to let you know that I've just added the patch titled

    perf dwarf: Guard !x86_64 definitions under #ifdef else clause

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-dwarf-guard-x86_64-definitions-under-ifdef-else-clause.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 62aa0e177d278462145a29c30d3c8501ae57e200 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 8 Apr 2016 12:04:29 -0300
Subject: perf dwarf: Guard !x86_64 definitions under #ifdef else clause

From: Arnaldo Carvalho de Melo <acme@redhat.com>

commit 62aa0e177d278462145a29c30d3c8501ae57e200 upstream.

To fix the build on Fedora Rawhide (gcc 6.0.0 20160311 (Red Hat 6.0.0-0.17):

    CC       /tmp/build/perf/arch/x86/util/dwarf-regs.o
  arch/x86/util/dwarf-regs.c:66:36: error: 'x86_32_regoffset_table' defined but not used [-Werror=unused-const-variable=]
   static const struct pt_regs_offset x86_32_regoffset_table[] = {
                                      ^~~~~~~~~~~~~~~~~~~~~~
  cc1: all warnings being treated as errors

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-fghuksc1u8ln82bof4lwcj0o@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 tools/perf/arch/x86/util/dwarf-regs.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/tools/perf/arch/x86/util/dwarf-regs.c
+++ b/tools/perf/arch/x86/util/dwarf-regs.c
@@ -63,6 +63,8 @@ struct pt_regs_offset {
 # define REG_OFFSET_NAME_32(n, r) {.name = n, .offset = offsetof(struct pt_regs, r)}
 #endif
 
+/* TODO: switching by dwarf address size */
+#ifndef __x86_64__
 static const struct pt_regs_offset x86_32_regoffset_table[] = {
 	REG_OFFSET_NAME_32("%ax",	eax),
 	REG_OFFSET_NAME_32("%cx",	ecx),
@@ -75,6 +77,8 @@ static const struct pt_regs_offset x86_3
 	REG_OFFSET_END,
 };
 
+#define regoffset_table x86_32_regoffset_table
+#else
 static const struct pt_regs_offset x86_64_regoffset_table[] = {
 	REG_OFFSET_NAME_64("%ax",	rax),
 	REG_OFFSET_NAME_64("%dx",	rdx),
@@ -95,11 +99,7 @@ static const struct pt_regs_offset x86_6
 	REG_OFFSET_END,
 };
 
-/* TODO: switching by dwarf address size */
-#ifdef __x86_64__
 #define regoffset_table x86_64_regoffset_table
-#else
-#define regoffset_table x86_32_regoffset_table
 #endif
 
 /* Minus 1 for the ending REG_OFFSET_END */


Patches currently in stable-queue which might be from acme@redhat.com are

queue-4.4/perf-tools-use-readdir-instead-of-deprecated-readdir_r.patch
queue-4.4/perf-thread_map-correctly-size-buffer-used-with-dirent-dt_name.patch
queue-4.4/perf-tests-remove-wrong-semicolon-in-while-loop-in-cqm-test.patch
queue-4.4/perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing-focussed.patch
queue-4.4/perf-tests-avoid-possible-truncation-with-dirent-d_name-snprintf.patch
queue-4.4/perf-top-use-__fallthrough.patch
queue-4.4/perf-scripting-perl-fix-compile-error-with-some-perl5-versions.patch
queue-4.4/perf-bench-numa-avoid-possible-truncation-when-using-snprintf.patch
queue-4.4/perf-tools-use-readdir-instead-of-deprecated-readdir_r-again.patch
queue-4.4/perf-thread_map-use-readdir-instead-of-deprecated-readdir_r.patch
queue-4.4/perf-tools-remove-duplicate-const-qualifier.patch
queue-4.4/tools-string-use-__fallthrough-in-perf_atoll.patch
queue-4.4/perf-intel-pt-use-__fallthrough.patch
queue-4.4/perf-script-use-readdir-instead-of-deprecated-readdir_r.patch
queue-4.4/tools-include-add-a-__fallthrough-statement.patch
queue-4.4/tools-strfilter-use-__fallthrough.patch
queue-4.4/perf-dwarf-guard-x86_64-definitions-under-ifdef-else-clause.patch
queue-4.4/perf-pmu-fix-misleadingly-indented-assignment-whitespace.patch
queue-4.4/perf-trace-do-not-process-perf_record_lost-twice.patch