]> www.infradead.org Git - users/jedix/linux-maple.git/commit
x86/platform/uv: Make SGI UV dependent on CONFIG_PCI
authorIngo Molnar <mingo@kernel.org>
Wed, 6 May 2015 04:23:59 +0000 (06:23 +0200)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 27 Feb 2017 01:23:48 +0000 (17:23 -0800)
commit1b882e6b1db3fcb41fb7e28a1331340ef995a2cb
tree5674fb6debc398e3874e54e81183b7ef9707f67f
parent0f906de9ab8ee259cfb21660a9d06659414e30a4
x86/platform/uv: Make SGI UV dependent on CONFIG_PCI

Orabug: 25477822

Recent PCI changes stopped exporting PCI constants if !CONFIG_PCI,
which made the UV build fail:

  arch/x86/kernel/apic/x2apic_uv_x.c:843:16: error: ‘PCI_VGA_STATE_CHANGE_BRIDGE’ undeclared (first use in this function)
  arch/x86/kernel/apic/x2apic_uv_x.c:1023:2: error: implicit declaration of function ‘pci_register_set_vga_state’ [-Werror=implicit-function-declaration]

As it's unlikely that an UV bootup will get far without PCI
enumeration, make the platform Kconfig switch (CONFIG_X86_UV)
depend on CONFIG_PCI=y.

Cc: Robin Holt <holt@sgi.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: Mike Travis <travis@sgi.com>
Cc: Jack Steiner <steiner@sgi.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 1222e564cf4394af0b3c5e8a73330b20862c068b)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
arch/x86/Kconfig