Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761222AbcLSK4b (ORCPT ); Mon, 19 Dec 2016 05:56:31 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58156 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759232AbcLSK4P (ORCPT ); Mon, 19 Dec 2016 05:56:15 -0500 Date: Mon, 19 Dec 2016 02:56:03 -0800 From: tip-bot for Markus Trippelsdorf Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, markus@trippelsdorf.de, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: markus@trippelsdorf.de, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <20161215124513.GA289@x4> References: <20161215124513.GA289@x4> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/tools: Fix gcc-7 warning in relocs.c Git-Commit-ID: 7ebb916782949621ff6819acf373a06902df7679 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1901 Lines: 52 Commit-ID: 7ebb916782949621ff6819acf373a06902df7679 Gitweb: http://git.kernel.org/tip/7ebb916782949621ff6819acf373a06902df7679 Author: Markus Trippelsdorf AuthorDate: Thu, 15 Dec 2016 13:45:13 +0100 Committer: Thomas Gleixner CommitDate: Mon, 19 Dec 2016 11:50:24 +0100 x86/tools: Fix gcc-7 warning in relocs.c gcc-7 warns: In file included from arch/x86/tools/relocs_64.c:17:0: arch/x86/tools/relocs.c: In function ‘process_64’: arch/x86/tools/relocs.c:953:2: warning: argument 1 null where non-null expected [-Wnonnull] qsort(r->offset, r->count, sizeof(r->offset[0]), cmp_relocs); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from arch/x86/tools/relocs.h:6:0, from arch/x86/tools/relocs_64.c:1: /usr/include/stdlib.h:741:13: note: in a call to function ‘qsort’ declared here extern void qsort This happens because relocs16 is not used for ELF_BITS == 64, so there is no point in trying to sort it. Make the sort_relocs(&relocs16) call 32bit only. Signed-off-by: Markus Trippelsdorf Link: http://lkml.kernel.org/r/20161215124513.GA289@x4 Signed-off-by: Thomas Gleixner --- arch/x86/tools/relocs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 0c2fae8..73eb7fd 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -992,11 +992,12 @@ static void emit_relocs(int as_text, int use_real_mode) die("Segment relocations found but --realmode not specified\n"); /* Order the relocations for more efficient processing */ - sort_relocs(&relocs16); sort_relocs(&relocs32); #if ELF_BITS == 64 sort_relocs(&relocs32neg); sort_relocs(&relocs64); +#else + sort_relocs(&relocs16); #endif /* Print the relocations */