xenoprof: default to off

This being x86-only right now, and its x86 bits being heavily outdated,
let's no longer enable this by default.

While there also adjust the "help" keyword spelling.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>

diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig
index d0e92c2ded1ff433b3a1e112f9b6f983edc6e856..a8ab1d4337c857c818eca9166daf9f6498aa10b5 100644 (file)
--- a/xen/arch/x86/configs/pvshim_defconfig
+++ b/xen/arch/x86/configs/pvshim_defconfig
@@ -13,7 +13,6 @@ CONFIG_EXPERT=y
 # CONFIG_HYPFS is not set
 # CONFIG_BIGMEM is not set
 # CONFIG_KEXEC is not set
-# CONFIG_XENOPROF is not set
 # CONFIG_XSM is not set
 # CONFIG_UNSUPPORTED is not set
 # CONFIG_SCHED_CREDIT is not set

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 3d2123a783bb6cd901784c2de3f20ff3fa0ec487..dd8d7c3f1ccbed2b085869405c28dec95beb9377 100644 (file)
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -229,10 +229,9 @@ config EFI_SET_VIRTUAL_ADDRESS_MAP
       If unsure, say N.
 
 config XENOPROF
-       def_bool y
-       prompt "Xen Oprofile Support" if EXPERT
+       bool "Xen Oprofile Support" if EXPERT
        depends on X86
-       ---help---
+       help
          Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual
          machine environments, capable of profiling the Xen virtual machine
          monitor, multiple Linux guest operating systems, and applications