Finally eradicate CONFIG_HOTPLUG
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 03:49:35 +0000 (13:49 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Jun 2013 21:20:18 +0000 (14:20 -0700)
Ever since commit 45f035ab9b8f ("CONFIG_HOTPLUG should be always on"),
it has been basically impossible to build a kernel with CONFIG_HOTPLUG
turned off.  Remove all the remaining references to it.

Cc: Russell King <linux@arm.linux.org.uk>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
33 files changed:
Documentation/ABI/testing/sysfs-bus-pci
Documentation/SubmitChecklist
Documentation/cpu-hotplug.txt
Documentation/hwmon/submitting-patches
Documentation/kbuild/kconfig.txt
Documentation/usb/hotplug.txt
arch/arm/Kconfig
arch/arm/kernel/module.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-ixp4xx/Kconfig
arch/blackfin/Kconfig
arch/cris/arch-v32/drivers/Kconfig
arch/ia64/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/powerpc/mm/tlb_hash64.c
arch/s390/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/x86/Kconfig
drivers/base/Kconfig
drivers/char/pcmcia/Kconfig
drivers/edac/Kconfig
drivers/pci/Kconfig
drivers/pci/hotplug/Kconfig
drivers/pcmcia/Kconfig
drivers/staging/media/go7007/go7007.txt
fs/gfs2/Kconfig
include/asm-generic/vmlinux.lds.h
init/Kconfig
kernel/power/Kconfig
mm/Kconfig

index 1ce5ae329c048fa1f9c84523592d5bfc34c22614..5210a51c90fd33bcb48434cfea1055058dfc250e 100644 (file)
@@ -64,7 +64,6 @@ Description:
                Writing a non-zero value to this attribute will
                force a rescan of all PCI buses in the system, and
                re-discover previously removed devices.
-               Depends on CONFIG_HOTPLUG.
 
 What:          /sys/bus/pci/devices/.../msi_irqs/
 Date:          September, 2011
@@ -90,7 +89,6 @@ Contact:      Linux PCI developers <linux-pci@vger.kernel.org>
 Description:
                Writing a non-zero value to this attribute will
                hot-remove the PCI device and any of its children.
-               Depends on CONFIG_HOTPLUG.
 
 What:          /sys/bus/pci/devices/.../pci_bus/.../rescan
 Date:          May 2011
@@ -99,7 +97,7 @@ Description:
                Writing a non-zero value to this attribute will
                force a rescan of the bus and all child buses,
                and re-discover devices removed earlier from this
-               part of the device tree.  Depends on CONFIG_HOTPLUG.
+               part of the device tree.
 
 What:          /sys/bus/pci/devices/.../rescan
 Date:          January 2009
@@ -109,7 +107,6 @@ Description:
                force a rescan of the device's parent bus and all
                child buses, and re-discover devices removed earlier
                from this part of the device tree.
-               Depends on CONFIG_HOTPLUG.
 
 What:          /sys/bus/pci/devices/.../reset
 Date:          July 2009
index dc0e33210d7e74aebce76802952b914a04cbb8e5..2b7e32dfe00d95fadabc535372bea6ba343fdc59 100644 (file)
@@ -105,5 +105,5 @@ kernel patches.
     same time, just various/random combinations of them]:
 
     CONFIG_SMP, CONFIG_SYSFS, CONFIG_PROC_FS, CONFIG_INPUT, CONFIG_PCI,
-    CONFIG_BLOCK, CONFIG_PM, CONFIG_HOTPLUG, CONFIG_MAGIC_SYSRQ,
+    CONFIG_BLOCK, CONFIG_PM, CONFIG_MAGIC_SYSRQ,
     CONFIG_NET, CONFIG_INET=n (but latter with CONFIG_NET=y)
index 9f401350f5021ce61eda8c6ce0a386bc93109d18..0efd1b905b9dd8f909e9e7bd184af4e66cd1e0f5 100644 (file)
@@ -128,7 +128,7 @@ A: When doing make defconfig, Enable CPU hotplug support
 
    "Processor type and Features" -> Support for Hotpluggable CPUs
 
-Make sure that you have CONFIG_HOTPLUG, and CONFIG_SMP turned on as well.
+Make sure that you have CONFIG_SMP turned on as well.
 
 You would need to enable CONFIG_HOTPLUG_CPU for SMP suspend/resume support
 as well.
index 843751c41fea59d207497d991a67bba5af1ee617..46286460462b8dde8f89494c93c294d34022d311 100644 (file)
@@ -27,8 +27,7 @@ increase the chances of your change being accepted.
   explicitly below the patch header.
 
 * If your patch (or the driver) is affected by configuration options such as
-  CONFIG_SMP or CONFIG_HOTPLUG, make sure it compiles for all configuration
-  variants.
+  CONFIG_SMP, make sure it compiles for all configuration variants.
 
 
 2. Adding functionality to existing drivers
index 3f429ed8b3b885a5a0af7d22d26c05cd9eac49e1..213859e69e88096fc9c45e60d6ddebd92f512e31 100644 (file)
@@ -165,7 +165,7 @@ Searching in menuconfig:
        Example:
                /hotplug
                This lists all config symbols that contain "hotplug",
-               e.g., HOTPLUG, HOTPLUG_CPU, MEMORY_HOTPLUG.
+               e.g., HOTPLUG_CPU, MEMORY_HOTPLUG.
 
        For search help, enter / followed TAB-TAB-TAB (to highlight
        <Help>) and Enter.  This will tell you that you can also use
index 4c945716a660d3e3884357409f1ab58c63fe9f92..6424b130485c5c26056191c09abe38c451b5f97a 100644 (file)
@@ -33,9 +33,9 @@ you get the best hotplugging when you configure a highly modular system.
 
 KERNEL HOTPLUG HELPER (/sbin/hotplug)
 
-When you compile with CONFIG_HOTPLUG, you get a new kernel parameter:
-/proc/sys/kernel/hotplug, which normally holds the pathname "/sbin/hotplug".
-That parameter names a program which the kernel may invoke at various times.
+There is a kernel parameter: /proc/sys/kernel/hotplug, which normally
+holds the pathname "/sbin/hotplug".  That parameter names a program
+which the kernel may invoke at various times.
 
 The /sbin/hotplug program can be invoked by any subsystem as part of its
 reaction to a configuration change, from a thread in that subsystem.
index 49d993cee51232874a81814fe39ca99e09b88bad..365e79f4fbf28ae3224568b111c5c11f040a2fbd 100644 (file)
@@ -1528,7 +1528,7 @@ config NR_CPUS
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
-       depends on SMP && HOTPLUG
+       depends on SMP
        help
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.
index 1e9be5d25e56adcddb8ea4cff5997fc1698e72ce..85c3fb6c93c2e234769b17e559655d100ad923ab 100644 (file)
@@ -288,24 +288,16 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
 
                if (strcmp(".ARM.exidx.init.text", secname) == 0)
                        maps[ARM_SEC_INIT].unw_sec = s;
-               else if (strcmp(".ARM.exidx.devinit.text", secname) == 0)
-                       maps[ARM_SEC_DEVINIT].unw_sec = s;
                else if (strcmp(".ARM.exidx", secname) == 0)
                        maps[ARM_SEC_CORE].unw_sec = s;
                else if (strcmp(".ARM.exidx.exit.text", secname) == 0)
                        maps[ARM_SEC_EXIT].unw_sec = s;
-               else if (strcmp(".ARM.exidx.devexit.text", secname) == 0)
-                       maps[ARM_SEC_DEVEXIT].unw_sec = s;
                else if (strcmp(".init.text", secname) == 0)
                        maps[ARM_SEC_INIT].txt_sec = s;
-               else if (strcmp(".devinit.text", secname) == 0)
-                       maps[ARM_SEC_DEVINIT].txt_sec = s;
                else if (strcmp(".text", secname) == 0)
                        maps[ARM_SEC_CORE].txt_sec = s;
                else if (strcmp(".exit.text", secname) == 0)
                        maps[ARM_SEC_EXIT].txt_sec = s;
-               else if (strcmp(".devexit.text", secname) == 0)
-                       maps[ARM_SEC_DEVEXIT].txt_sec = s;
        }
 
        for (i = 0; i < ARM_SEC_MAX; i++)
index a871b8e00fca7d67141859bbb2415dadabbc1ad5..fa25e4e425f6070c0a6055de98271f865dde3823 100644 (file)
@@ -70,10 +70,6 @@ SECTIONS
                ARM_EXIT_DISCARD(EXIT_TEXT)
                ARM_EXIT_DISCARD(EXIT_DATA)
                EXIT_CALL
-#ifndef CONFIG_HOTPLUG
-               *(.ARM.exidx.devexit.text)
-               *(.ARM.extab.devexit.text)
-#endif
 #ifndef CONFIG_MMU
                *(.fixup)
                *(__ex_table)
index 73a2d905af8ac1289be0711807a4392a954df479..30e1ebe3a8916e7f4fb9eb00397c180ea4786ff6 100644 (file)
@@ -235,7 +235,6 @@ config IXP4XX_QMGR
 config IXP4XX_NPE
        tristate "IXP4xx Network Processor Engine support"
        select FW_LOADER
-       select HOTPLUG
        help
          This driver supports IXP4xx built-in network coprocessors
          and is automatically selected by Ethernet and HSS drivers.
index a117652b5feaac84e4bb880bb8b1b4772c8b6f5a..b573827d0416b146b0308ba2043b4587df678e36 100644 (file)
@@ -253,7 +253,7 @@ config NR_CPUS
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
-       depends on SMP && HOTPLUG
+       depends on SMP
        default y
 
 config BF_REV_MIN
index c55971a40c34e8433faa9fc70d12566feed21045..ab725edbc680adea502ea245a9ff70ea73e1cdf3 100644 (file)
@@ -617,7 +617,6 @@ config ETRAX_PV_CHANGEABLE_BITS
 config ETRAX_CARDBUS
         bool "Cardbus support"
         depends on ETRAX_ARCH_V32
-        select HOTPLUG
         help
         Enabled the ETRAX Cardbus driver.
 
index 1a2b7749b0478a75c49e58df2862de0765d71980..5a768ad8e893212cdab14e15edd1c8c6d3fe22b7 100644 (file)
@@ -376,7 +376,6 @@ config NR_CPUS
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
        depends on SMP
-       select HOTPLUG
        default n
        ---help---
          Say Y here to experiment with turning CPUs off and on.  CPUs
index 7a58ab933b206a397c56b65f6a608fc4f9a1d8eb..e433b90507fb10a721e59a170be53d2859f28f32 100644 (file)
@@ -962,7 +962,7 @@ config SYS_HAS_EARLY_PRINTK
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
-       depends on SMP && HOTPLUG && SYS_SUPPORTS_HOTPLUG_CPU
+       depends on SMP && SYS_SUPPORTS_HOTPLUG_CPU
        help
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.
index 6507dabdd5ddc1a758e68f7476eb197fac9ec7b3..2a2aea5aae5bd7ba489c57e4cc9744752fd7c5f2 100644 (file)
@@ -254,7 +254,6 @@ config IRQSTACKS
 config HOTPLUG_CPU
        bool
        default y if SMP
-       select HOTPLUG
 
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
index c33e3ad2c8fd52c9e0c31dfc272faf3d34902f37..508e3fe934d2f112bebd82083db24f70b64f90b8 100644 (file)
@@ -341,7 +341,7 @@ config SWIOTLB
 
 config HOTPLUG_CPU
        bool "Support for enabling/disabling CPUs"
-       depends on SMP && HOTPLUG && (PPC_PSERIES || \
+       depends on SMP && (PPC_PSERIES || \
        PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
        ---help---
          Say Y here to be able to disable and re-enable individual
index 023ec8a13f38eed82e45fe37fc0f6e4be9518b83..7df1c5edda87fc88f5b388b185dbf3bde75ac571 100644 (file)
@@ -183,8 +183,8 @@ void tlb_flush(struct mmu_gather *tlb)
  * since 64K pages may overlap with other bridges when using 64K pages
  * with 4K HW pages on IO space.
  *
- * Because of that usage pattern, it's only available with CONFIG_HOTPLUG
- * and is implemented for small size rather than speed.
+ * Because of that usage pattern, it is implemented for small size rather
+ * than speed.
  */
 void __flush_hash_table_range(struct mm_struct *mm, unsigned long start,
                              unsigned long end)
index da183c5a103ce1df1da3617bbde788011f0351d3..22f75b504f7f9bb8ef91ef80e8a1433995e6c6dc 100644 (file)
@@ -301,7 +301,6 @@ config HOTPLUG_CPU
        def_bool y
        prompt "Support for hot-pluggable CPUs"
        depends on SMP
-       select HOTPLUG
        help
          Say Y here to be able to turn CPUs off and on. CPUs
          can be controlled through /sys/devices/system/cpu/cpu#.
index 8c868cf2cf93febf478cc199e2a996ff64b244d1..1020dd85431aae9197f264c081d97b7e7e178ed7 100644 (file)
@@ -748,7 +748,7 @@ config NR_CPUS
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-       depends on SMP && HOTPLUG
+       depends on SMP
        help
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.
index 9ac9f1666339015c3220631a4efe43226844b6d3..a00cbd356db5f4ae761a13de76730844ad67ae8e 100644 (file)
@@ -243,7 +243,6 @@ config SECCOMP
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
        depends on SPARC64 && SMP
-       select HOTPLUG
        help
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu/cpu#.
index 685692c94f051a8a7ad582442efcc3fa11173332..ae917f3965f1108c8043e67eecad7122a163725a 100644 (file)
@@ -1725,7 +1725,7 @@ config PHYSICAL_ALIGN
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
-       depends on SMP && HOTPLUG
+       depends on SMP
        ---help---
          Say Y here to allow turning CPUs off and on. CPUs can be
          controlled through /sys/devices/system/cpu.
index 07abd9d76f7ff731eaef404c9eb84a3d227bc1e0..5daa2599ed48d3fad44223dc904d0cfdc2cbad09 100644 (file)
@@ -2,7 +2,6 @@ menu "Generic Driver Options"
 
 config UEVENT_HELPER_PATH
        string "path to uevent helper"
-       depends on HOTPLUG
        default ""
        help
          Path to uevent helper program forked by the kernel for
@@ -23,7 +22,6 @@ config UEVENT_HELPER_PATH
 
 config DEVTMPFS
        bool "Maintain a devtmpfs filesystem to mount at /dev"
-       depends on HOTPLUG
        help
          This creates a tmpfs/ramfs filesystem instance early at bootup.
          In this filesystem, the kernel driver core maintains device
index 2a166d56738ac85947c0b6f4103750050d5ea7b1..b27f5342fe76157b5ebcf39077b981a3da180eb3 100644 (file)
@@ -3,7 +3,7 @@
 #
 
 menu "PCMCIA character devices"
-       depends on HOTPLUG && PCMCIA!=n
+       depends on PCMCIA!=n
 
 config SYNCLINK_CS
        tristate "SyncLink PC Card support"
index e443f2c1dfd1685ab0bcf88be945e898a5373a55..a697a64d53837bda97602e2948fb165f73a57312 100644 (file)
@@ -145,7 +145,7 @@ config EDAC_E7XXX
 
 config EDAC_E752X
        tristate "Intel e752x (e7520, e7525, e7320) and 3100"
-       depends on EDAC_MM_EDAC && PCI && X86 && HOTPLUG
+       depends on EDAC_MM_EDAC && PCI && X86
        help
          Support for error detection and correction on the Intel
          E7520, E7525, E7320 server chipsets.
index 6d51aa68ec7a635dc85e7e533d1de8ba0c0674ed..77497f140d68b5b356b9b23c918d19b21d483934 100644 (file)
@@ -55,7 +55,6 @@ config PCI_STUB
 config XEN_PCIDEV_FRONTEND
         tristate "Xen PCI Frontend"
         depends on PCI && X86 && XEN
-        select HOTPLUG
         select PCI_XEN
        select XEN_XENBUS_FRONTEND
         default y
@@ -113,7 +112,6 @@ config PCI_IOAPIC
        tristate "PCI IO-APIC hotplug support" if X86
        depends on PCI
        depends on ACPI
-       depends on HOTPLUG
        default !X86
 
 config PCI_LABEL
index 9fcb87f353d44cec965301af6799fd8b950d8794..bb7ebb22db01e39a66840ba4684f811e7d89e075 100644 (file)
@@ -4,7 +4,7 @@
 
 menuconfig HOTPLUG_PCI
        tristate "Support for PCI Hotplug"
-       depends on PCI && HOTPLUG && SYSFS
+       depends on PCI && SYSFS
        ---help---
          Say Y here if you have a motherboard with a PCI Hotplug controller.
          This allows you to add and remove PCI cards while the machine is
index b90f85bf5f811c098bfc01b9ed47ee8ee8c7bf00..1c6362491bdf63b38cbf35cde1827673b46d532f 100644 (file)
@@ -4,7 +4,6 @@
 
 menuconfig PCCARD
        tristate "PCCard (PCMCIA/CardBus) support"
-       depends on HOTPLUG
        ---help---
          Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
          computer.  These are credit-card size devices such as network cards,
index fcb3e235abbf6df0ae9e7e4bbfb53d333f298cc7..dc0026cff9f6bfc3527425e38e097d6392825cf2 100644 (file)
@@ -78,7 +78,6 @@ All vendor-built kernels should already be configured properly.  However,
 for custom-built kernels, the following options need to be enabled in the
 kernel as built-in or modules:
 
-       CONFIG_HOTPLUG           - Support for hot-pluggable devices
        CONFIG_MODULES           - Enable loadable module support
        CONFIG_KMOD              - Automatic kernel module loading
        CONFIG_FW_LOADER         - Hotplug firmware loading support
index 5a376ab81feb9021620cdb13b0cd1642059ead43..90c6a8faaecba0cbd0d152956eae316c1a1e2474 100644 (file)
@@ -20,13 +20,12 @@ config GFS2_FS
          be found here: http://sources.redhat.com/cluster
 
          The "nolock" lock module is now built in to GFS2 by default. If
-         you want to use the DLM, be sure to enable HOTPLUG and IPv4/6
-         networking.
+         you want to use the DLM, be sure to enable IPv4/6 networking.
 
 config GFS2_FS_LOCKING_DLM
        bool "GFS2 DLM locking"
        depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \
-               HOTPLUG && CONFIGFS_FS && SYSFS && (DLM=y || DLM=GFS2_FS)
+               CONFIGFS_FS && SYSFS && (DLM=y || DLM=GFS2_FS)
        help
          Multiple node locking module for GFS2
 
index eb58d2d7d9718d0c220387b3c60febf30f324e71..4f2737208c4275063702dbf6009cec6b600c4744 100644 (file)
  * are handled as text/data or they can be discarded (which
  * often happens at runtime)
  */
-#ifdef CONFIG_HOTPLUG
-#define DEV_KEEP(sec)    *(.dev##sec)
-#define DEV_DISCARD(sec)
-#else
-#define DEV_KEEP(sec)
-#define DEV_DISCARD(sec) *(.dev##sec)
-#endif
-
 #ifdef CONFIG_HOTPLUG_CPU
 #define CPU_KEEP(sec)    *(.cpu##sec)
 #define CPU_DISCARD(sec)
        *(.data)                                                        \
        *(.ref.data)                                                    \
        *(.data..shared_aligned) /* percpu related */                   \
-       DEV_KEEP(init.data)                                             \
-       DEV_KEEP(exit.data)                                             \
        CPU_KEEP(init.data)                                             \
        CPU_KEEP(exit.data)                                             \
        MEM_KEEP(init.data)                                             \
        /* __*init sections */                                          \
        __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) {         \
                *(.ref.rodata)                                          \
-               DEV_KEEP(init.rodata)                                   \
-               DEV_KEEP(exit.rodata)                                   \
                CPU_KEEP(init.rodata)                                   \
                CPU_KEEP(exit.rodata)                                   \
                MEM_KEEP(init.rodata)                                   \
                *(.text.hot)                                            \
                *(.text)                                                \
                *(.ref.text)                                            \
-       DEV_KEEP(init.text)                                             \
-       DEV_KEEP(exit.text)                                             \
        CPU_KEEP(init.text)                                             \
        CPU_KEEP(exit.text)                                             \
        MEM_KEEP(init.text)                                             \
 /* init and exit section handling */
 #define INIT_DATA                                                      \
        *(.init.data)                                                   \
-       DEV_DISCARD(init.data)                                          \
        CPU_DISCARD(init.data)                                          \
        MEM_DISCARD(init.data)                                          \
        KERNEL_CTORS()                                                  \
        *(.init.rodata)                                                 \
        FTRACE_EVENTS()                                                 \
        TRACE_SYSCALLS()                                                \
-       DEV_DISCARD(init.rodata)                                        \
        CPU_DISCARD(init.rodata)                                        \
        MEM_DISCARD(init.rodata)                                        \
        CLK_OF_TABLES()                                                 \
 
 #define INIT_TEXT                                                      \
        *(.init.text)                                                   \
-       DEV_DISCARD(init.text)                                          \
        CPU_DISCARD(init.text)                                          \
        MEM_DISCARD(init.text)
 
 #define EXIT_DATA                                                      \
        *(.exit.data)                                                   \
-       DEV_DISCARD(exit.data)                                          \
-       DEV_DISCARD(exit.rodata)                                        \
        CPU_DISCARD(exit.data)                                          \
        CPU_DISCARD(exit.rodata)                                        \
        MEM_DISCARD(exit.data)                                          \
 
 #define EXIT_TEXT                                                      \
        *(.exit.text)                                                   \
-       DEV_DISCARD(exit.text)                                          \
        CPU_DISCARD(exit.text)                                          \
        MEM_DISCARD(exit.text)
 
index 9d3a7887a6d3e0b7a8323865b658e1d088dcea85..a5e0917165fe15bf6ad4957417df0c1f385f1983 100644 (file)
@@ -1244,9 +1244,6 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
          the unaligned access emulation.
          see arch/parisc/kernel/unaligned.c for reference
 
-config HOTPLUG
-       def_bool y
-
 config HAVE_PCSPKR_PLATFORM
        bool
 
index 5dfdc9ea180b8ac497ed915c45b809fb65799261..9c39de095ba905558d2f032278f63efa9d3ad081 100644 (file)
@@ -100,7 +100,6 @@ config PM_SLEEP_SMP
        depends on SMP
        depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
        depends on PM_SLEEP
-       select HOTPLUG
        select HOTPLUG_CPU
 
 config PM_AUTOSLEEP
index e742d06285b780eea632efe643e18d695f766928..f5e698e30d4a230f6fe0b45e92892483507f3ade 100644 (file)
@@ -173,7 +173,7 @@ config HAVE_BOOTMEM_INFO_NODE
 config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
        depends on SPARSEMEM || X86_64_ACPI_NUMA
-       depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG
+       depends on ARCH_ENABLE_MEMORY_HOTPLUG
        depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390)
 
 config MEMORY_HOTPLUG_SPARSE