| Message ID | 20161024153325.2752428-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Oct 24, 2016 at 05:33:18PM +0200, Arnd Bergmann wrote: > 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 <arnd@arndb.de> This fixes 3637efb00864 ("x86/mce: Add PCI quirks to identify Xeons with machine check recovery"), which appeared in v4.9-rc1. I assume it will be merged for v4.9 via the x86 tree, as 3637efb00864 was. Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > 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 51402a7e4ca6..0bee04d41bed 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 <linux/jump_label.h> > #include <asm/string_64.h> > @@ -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 > -- > 2.9.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Bjorn Helgaas <helgaas@kernel.org> wrote: > On Mon, Oct 24, 2016 at 05:33:18PM +0200, Arnd Bergmann wrote: > > 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 <arnd@arndb.de> > > This fixes 3637efb00864 ("x86/mce: Add PCI quirks to identify Xeons with > machine check recovery"), which appeared in v4.9-rc1. I assume it will be > merged for v4.9 via the x86 tree, as 3637efb00864 was. > > Acked-by: Bjorn Helgaas <bhelgaas@google.com> Yeah, that's the plan - thanks! Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 51402a7e4ca6..0bee04d41bed 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 <linux/jump_label.h> #include <asm/string_64.h> @@ -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
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 <arnd@arndb.de> --- arch/x86/kernel/quirks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)