summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-19 19:44:48 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-20 07:53:24 +0200
commitb8bb922c680b7e21af2268bc8eec93b17f5b9ab8 (patch)
tree09a251e2bf24296ad6bbfb238a37e2e58e70dcbf /arch/powerpc
parenthvcs: Ensure page aligned partner info buffer (diff)
downloadlinux-b8bb922c680b7e21af2268bc8eec93b17f5b9ab8.tar.xz
linux-b8bb922c680b7e21af2268bc8eec93b17f5b9ab8.zip
powerpc/udbg: Fix Kconfig entry for avoiding 44x early debug with KVM
It was preventing the global early debug selection whenever KVM was enabled instead of only preventing the 440 specific one. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/Kconfig.debug7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index ab2335f160a0..06eb62b0fd90 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -141,9 +141,6 @@ config BOOTX_TEXT
config PPC_EARLY_DEBUG
bool "Early debugging (dangerous)"
- # PPC_EARLY_DEBUG on 440 leaves AS=1 mappings above the TLB high water
- # mark, which doesn't work with current 440 KVM.
- depends on !KVM
help
Say Y to enable some early debugging facilities that may be available
for your processor/board combination. Those facilities are hacks
@@ -222,7 +219,9 @@ config PPC_EARLY_DEBUG_BEAT
config PPC_EARLY_DEBUG_44x
bool "Early serial debugging for IBM/AMCC 44x CPUs"
- depends on 44x
+ # PPC_EARLY_DEBUG on 440 leaves AS=1 mappings above the TLB high water
+ # mark, which doesn't work with current 440 KVM.
+ depends on 44x && !KVM
help
Select this to enable early debugging for IBM 44x chips via the
inbuilt serial port. If you enable this, ensure you set