summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorStephen Rothwell2013-03-07 05:48:16 +0100
committerLinus Torvalds2013-03-12 19:16:40 +0100
commit4febd95a8a85dd38b1a71fcf9726e19c7fd20039 (patch)
tree481a2d9ba18e2f76824659aa83c219f7c983db49 /arch/x86
parentFix: compat_rw_copy_check_uvector() misuse in aio, readv, writev, and securit... (diff)
downloadkernel-qcow2-linux-4febd95a8a85dd38b1a71fcf9726e19c7fd20039.tar.gz
kernel-qcow2-linux-4febd95a8a85dd38b1a71fcf9726e19c7fd20039.tar.xz
kernel-qcow2-linux-4febd95a8a85dd38b1a71fcf9726e19c7fd20039.zip
Select VIRT_TO_BUS directly where needed
In commit 887cbce0adea ("arch Kconfig: centralise ARCH_NO_VIRT_TO_BUS") I introduced the config sybmol HAVE_VIRT_TO_BUS and selected that where needed. I am not sure what I was thinking. Instead, just directly select VIRT_TO_BUS where it is needed. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a4f24f5b1218..70c0f3da0476 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -112,7 +112,7 @@ config X86
select GENERIC_STRNLEN_USER
select HAVE_CONTEXT_TRACKING if X86_64
select HAVE_IRQ_TIME_ACCOUNTING
- select HAVE_VIRT_TO_BUS
+ select VIRT_TO_BUS
select MODULES_USE_ELF_REL if X86_32
select MODULES_USE_ELF_RELA if X86_64
select CLONE_BACKWARDS if X86_32