aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 21:04:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 21:04:27 -0500
commite343a895a9f342f239c5e3c5ffc6c0b1707e6244 (patch)
tree46c81c6ae375b1f14e209b13c8ac020842807ece /arch/x86/Kconfig
parent06792c4dde2ad143928cc95c1ba218c6269c494b (diff)
parent193a667fba76b3df482cbf865228e26ee246e889 (diff)
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
lib: use generic pci_iomap on all architectures Many architectures don't want to pull in iomap.c, so they ended up duplicating pci_iomap from that file. That function isn't trivial, and we are going to modify it https://lkml.org/lkml/2011/11/14/183 so the duplication hurts. This reduces the scope of the problem significantly, by moving pci_iomap to a separate file and referencing that from all architectures. * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: alpha: drop pci_iomap/pci_iounmap from pci-noop.c mn10300: switch to GENERIC_PCI_IOMAP mn10300: add missing __iomap markers frv: switch to GENERIC_PCI_IOMAP tile: switch to GENERIC_PCI_IOMAP tile: don't panic on iomap sparc: switch to GENERIC_PCI_IOMAP sh: switch to GENERIC_PCI_IOMAP powerpc: switch to GENERIC_PCI_IOMAP parisc: switch to GENERIC_PCI_IOMAP mips: switch to GENERIC_PCI_IOMAP microblaze: switch to GENERIC_PCI_IOMAP arm: switch to GENERIC_PCI_IOMAP alpha: switch to GENERIC_PCI_IOMAP lib: add GENERIC_PCI_IOMAP lib: move GENERIC_IOMAP to lib/Kconfig Fix up trivial conflicts due to changes nearby in arch/{m68k,score}/Kconfig
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d6ddc0bfe36a..1a31254ceb83 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -78,6 +78,7 @@ config X86
78 select HAVE_BPF_JIT if (X86_64 && NET) 78 select HAVE_BPF_JIT if (X86_64 && NET)
79 select CLKEVT_I8253 79 select CLKEVT_I8253
80 select ARCH_HAVE_NMI_SAFE_CMPXCHG 80 select ARCH_HAVE_NMI_SAFE_CMPXCHG
81 select GENERIC_IOMAP
81 82
82config INSTRUCTION_DECODER 83config INSTRUCTION_DECODER
83 def_bool (KPROBES || PERF_EVENTS) 84 def_bool (KPROBES || PERF_EVENTS)
@@ -143,9 +144,6 @@ config NEED_SG_DMA_LENGTH
143config GENERIC_ISA_DMA 144config GENERIC_ISA_DMA
144 def_bool ISA_DMA_API 145 def_bool ISA_DMA_API
145 146
146config GENERIC_IOMAP
147 def_bool y
148
149config GENERIC_BUG 147config GENERIC_BUG
150 def_bool y 148 def_bool y
151 depends on BUG 149 depends on BUG