3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: "H. Peter Anvin" <[email protected]>

commit e43b3cec711a61edf047adf6204d542f3a659ef8 upstream.

early_pci_allowed() and read_pci_config_16() are only available if
CONFIG_PCI is defined.

Signed-off-by: H. Peter Anvin <[email protected]>
Cc: Jesse Barnes <[email protected]>
Signed-off-by: Abdallah Chatila <[email protected]>

---
 arch/x86/kernel/setup.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -622,6 +622,7 @@ static unsigned reserve_low = CONFIG_X86
 
 static bool __init snb_gfx_workaround_needed(void)
 {
+#ifdef CONFIG_PCI
        int i;
        u16 vendor, devid;
        static const u16 snb_ids[] = {
@@ -646,6 +647,7 @@ static bool __init snb_gfx_workaround_ne
        for (i = 0; i < ARRAY_SIZE(snb_ids); i++)
                if (devid == snb_ids[i])
                        return true;
+#endif
 
        return false;
 }


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to