From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941610AbcJYKct (ORCPT ); Tue, 25 Oct 2016 06:32:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60990 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754958AbcJYKcq (ORCPT ); Tue, 25 Oct 2016 06:32:46 -0400 Date: Tue, 25 Oct 2016 03:31:56 -0700 From: tip-bot for Arnd Bergmann Message-ID: Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, bhelgaas@google.com, tony.luck@intel.com, arnd@arndb.de, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, bp@suse.de, torvalds@linux-foundation.org Reply-To: mingo@kernel.org, bp@suse.de, tglx@linutronix.de, hpa@zytor.com, arnd@arndb.de, tony.luck@intel.com, torvalds@linux-foundation.org, bhelgaas@google.com, linux-kernel@vger.kernel.org, peterz@infradead.org In-Reply-To: <20161024153325.2752428-1-arnd@arndb.de> References: <20161024153325.2752428-1-arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/quirks: Hide maybe-uninitialized warning Git-Commit-ID: d320b9a5bd85f6178cc3ed8b0a1a9960f2b5bc7b 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 Commit-ID: d320b9a5bd85f6178cc3ed8b0a1a9960f2b5bc7b Gitweb: http://git.kernel.org/tip/d320b9a5bd85f6178cc3ed8b0a1a9960f2b5bc7b Author: Arnd Bergmann AuthorDate: Mon, 24 Oct 2016 17:33:18 +0200 Committer: Ingo Molnar CommitDate: Tue, 25 Oct 2016 11:45:13 +0200 x86/quirks: Hide maybe-uninitialized warning gcc -Wmaybe-uninitialized detects that quirk_intel_brickland_xeon_ras_cap uses uninitialized data when CONFIG_PCI is not set: arch/x86/kernel/quirks.c: In function ‘quirk_intel_brickland_xeon_ras_cap’: arch/x86/kernel/quirks.c:641:13: error: ‘capid0’ is used uninitialized in this function [-Werror=uninitialized] However, the function is also not called in this configuration, so we can avoid the warning by moving the existing #ifdef to cover it as well. Signed-off-by: Arnd Bergmann Cc: Bjorn Helgaas Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-pci@vger.kernel.org Link: http://lkml.kernel.org/r/20161024153325.2752428-1-arnd@arndb.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/quirks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 51402a7..0bee04d 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -625,8 +625,6 @@ static void amd_disable_seq_and_redirect_scrub(struct pci_dev *dev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3, amd_disable_seq_and_redirect_scrub); -#endif - #if defined(CONFIG_X86_64) && defined(CONFIG_X86_MCE) #include #include @@ -657,3 +655,4 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, quirk_intel_brickland_xeon_ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, quirk_intel_brickland_xeon_ras_cap); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2083, quirk_intel_purley_xeon_ras_cap); #endif +#endif