ia64/xen-unstable

changeset 8728:d609de73b9fa

find changesets by author, revision, files, or words in the commit message
Permit compilation of HOTPLUG_CPU on i386.
move the entry into another menu that is not !XEN_PRIVILEGED
also, add HOTPLUG_CPU back into i386 domU default configs.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vhanquez@kneesa.uk.xensource.com
date Wed Feb 01 17:06:16 2006 +0000 (2006-02-01)
parents 2c5873f99fe5
children 5a63f675107c
files buildconfigs/linux-defconfig_xenU_x86_32 buildconfigs/linux-defconfig_xen_x86_32 linux-2.6-xen-sparse/arch/i386/Kconfig
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xenU_x86_32	Wed Feb 01 16:30:28 2006 +0000
     1.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_32	Wed Feb 01 17:06:16 2006 +0000
     1.3 @@ -148,6 +148,7 @@ CONFIG_HZ_250=y
     1.4  # CONFIG_HZ_1000 is not set
     1.5  CONFIG_HZ=250
     1.6  CONFIG_PHYSICAL_START=0x100000
     1.7 +CONFIG_HOTPLUG_CPU=y
     1.8  
     1.9  #
    1.10  # Executable file formats

     2.1 --- a/buildconfigs/linux-defconfig_xen_x86_32	Wed Feb 01 16:30:28 2006 +0000
     2.2 +++ b/buildconfigs/linux-defconfig_xen_x86_32	Wed Feb 01 17:06:16 2006 +0000
     2.3 @@ -156,6 +156,7 @@ CONFIG_HZ_250=y
     2.4  # CONFIG_HZ_1000 is not set
     2.5  CONFIG_HZ=250
     2.6  CONFIG_PHYSICAL_START=0x100000
     2.7 +CONFIG_HOTPLUG_CPU=y
     2.8  # CONFIG_CRASH_DUMP is not set
     2.9  
    2.10  #

     3.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig	Wed Feb 01 16:30:28 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig	Wed Feb 01 17:06:16 2006 +0000
     3.3 @@ -1014,6 +1014,16 @@ config CRASH_DUMP
     3.4  	depends on HIGHMEM
     3.5  	help
     3.6  	  Generate crash dump after being started by kexec.
     3.7 +
     3.8 +config HOTPLUG_CPU
     3.9 +	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
    3.10 +	depends on SMP && HOTPLUG && EXPERIMENTAL
    3.11 +	---help---
    3.12 +	  Say Y here to experiment with turning CPUs off and on.  CPUs
    3.13 +	  can be controlled through /sys/devices/system/cpu.
    3.14 +
    3.15 +	  Say N.
    3.16 +
    3.17  endmenu
    3.18  
    3.19  
    3.20 @@ -1305,15 +1315,6 @@ config SCx200
    3.21  	  This support is also available as a module.  If compiled as a
    3.22  	  module, it will be called scx200.
    3.23  
    3.24 -config HOTPLUG_CPU
    3.25 -	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
    3.26 -	depends on SMP && HOTPLUG && EXPERIMENTAL
    3.27 -	---help---
    3.28 -	  Say Y here to experiment with turning CPUs off and on.  CPUs
    3.29 -	  can be controlled through /sys/devices/system/cpu.
    3.30 -
    3.31 -	  Say N.
    3.32 -
    3.33  source "drivers/pcmcia/Kconfig"
    3.34  
    3.35  source "drivers/pci/hotplug/Kconfig"