Finally eradicate CONFIG_HOTPLUG

Ever since commit 45f035ab9b ("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>
This commit is contained in:
Stephen Rothwell 2013-05-21 13:49:35 +10:00 committed by Greg Kroah-Hartman
parent af5bc11e9a
commit 40b313608a
33 changed files with 22 additions and 75 deletions

View file

@ -64,7 +64,6 @@ Description:
Writing a non-zero value to this attribute will Writing a non-zero value to this attribute will
force a rescan of all PCI buses in the system, and force a rescan of all PCI buses in the system, and
re-discover previously removed devices. re-discover previously removed devices.
Depends on CONFIG_HOTPLUG.
What: /sys/bus/pci/devices/.../msi_irqs/ What: /sys/bus/pci/devices/.../msi_irqs/
Date: September, 2011 Date: September, 2011
@ -90,7 +89,6 @@ Contact: Linux PCI developers <linux-pci@vger.kernel.org>
Description: Description:
Writing a non-zero value to this attribute will Writing a non-zero value to this attribute will
hot-remove the PCI device and any of its children. hot-remove the PCI device and any of its children.
Depends on CONFIG_HOTPLUG.
What: /sys/bus/pci/devices/.../pci_bus/.../rescan What: /sys/bus/pci/devices/.../pci_bus/.../rescan
Date: May 2011 Date: May 2011
@ -99,7 +97,7 @@ Description:
Writing a non-zero value to this attribute will Writing a non-zero value to this attribute will
force a rescan of the bus and all child buses, force a rescan of the bus and all child buses,
and re-discover devices removed earlier from this 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 What: /sys/bus/pci/devices/.../rescan
Date: January 2009 Date: January 2009
@ -109,7 +107,6 @@ Description:
force a rescan of the device's parent bus and all force a rescan of the device's parent bus and all
child buses, and re-discover devices removed earlier child buses, and re-discover devices removed earlier
from this part of the device tree. from this part of the device tree.
Depends on CONFIG_HOTPLUG.
What: /sys/bus/pci/devices/.../reset What: /sys/bus/pci/devices/.../reset
Date: July 2009 Date: July 2009

View file

@ -105,5 +105,5 @@ kernel patches.
same time, just various/random combinations of them]: same time, just various/random combinations of them]:
CONFIG_SMP, CONFIG_SYSFS, CONFIG_PROC_FS, CONFIG_INPUT, CONFIG_PCI, 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) CONFIG_NET, CONFIG_INET=n (but latter with CONFIG_NET=y)

View file

@ -128,7 +128,7 @@ A: When doing make defconfig, Enable CPU hotplug support
"Processor type and Features" -> Support for Hotpluggable CPUs "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 You would need to enable CONFIG_HOTPLUG_CPU for SMP suspend/resume support
as well. as well.

View file

@ -27,8 +27,7 @@ increase the chances of your change being accepted.
explicitly below the patch header. explicitly below the patch header.
* If your patch (or the driver) is affected by configuration options such as * 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 CONFIG_SMP, make sure it compiles for all configuration variants.
variants.
2. Adding functionality to existing drivers 2. Adding functionality to existing drivers

View file

@ -165,7 +165,7 @@ Searching in menuconfig:
Example: Example:
/hotplug /hotplug
This lists all config symbols that contain "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 For search help, enter / followed TAB-TAB-TAB (to highlight
<Help>) and Enter. This will tell you that you can also use <Help>) and Enter. This will tell you that you can also use

View file

@ -33,9 +33,9 @@ you get the best hotplugging when you configure a highly modular system.
KERNEL HOTPLUG HELPER (/sbin/hotplug) KERNEL HOTPLUG HELPER (/sbin/hotplug)
When you compile with CONFIG_HOTPLUG, you get a new kernel parameter: There is a kernel parameter: /proc/sys/kernel/hotplug, which normally
/proc/sys/kernel/hotplug, which normally holds the pathname "/sbin/hotplug". holds the pathname "/sbin/hotplug". That parameter names a program
That parameter names a program which the kernel may invoke at various times. which the kernel may invoke at various times.
The /sbin/hotplug program can be invoked by any subsystem as part of its 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. reaction to a configuration change, from a thread in that subsystem.

View file

@ -1528,7 +1528,7 @@ config NR_CPUS
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs" bool "Support for hot-pluggable CPUs"
depends on SMP && HOTPLUG depends on SMP
help help
Say Y here to experiment with turning CPUs off and on. CPUs Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu. can be controlled through /sys/devices/system/cpu.

View file

@ -288,24 +288,16 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
if (strcmp(".ARM.exidx.init.text", secname) == 0) if (strcmp(".ARM.exidx.init.text", secname) == 0)
maps[ARM_SEC_INIT].unw_sec = s; 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) else if (strcmp(".ARM.exidx", secname) == 0)
maps[ARM_SEC_CORE].unw_sec = s; maps[ARM_SEC_CORE].unw_sec = s;
else if (strcmp(".ARM.exidx.exit.text", secname) == 0) else if (strcmp(".ARM.exidx.exit.text", secname) == 0)
maps[ARM_SEC_EXIT].unw_sec = s; 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) else if (strcmp(".init.text", secname) == 0)
maps[ARM_SEC_INIT].txt_sec = s; 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) else if (strcmp(".text", secname) == 0)
maps[ARM_SEC_CORE].txt_sec = s; maps[ARM_SEC_CORE].txt_sec = s;
else if (strcmp(".exit.text", secname) == 0) else if (strcmp(".exit.text", secname) == 0)
maps[ARM_SEC_EXIT].txt_sec = s; 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++) for (i = 0; i < ARM_SEC_MAX; i++)

View file

@ -70,10 +70,6 @@ SECTIONS
ARM_EXIT_DISCARD(EXIT_TEXT) ARM_EXIT_DISCARD(EXIT_TEXT)
ARM_EXIT_DISCARD(EXIT_DATA) ARM_EXIT_DISCARD(EXIT_DATA)
EXIT_CALL EXIT_CALL
#ifndef CONFIG_HOTPLUG
*(.ARM.exidx.devexit.text)
*(.ARM.extab.devexit.text)
#endif
#ifndef CONFIG_MMU #ifndef CONFIG_MMU
*(.fixup) *(.fixup)
*(__ex_table) *(__ex_table)

View file

@ -235,7 +235,6 @@ config IXP4XX_QMGR
config IXP4XX_NPE config IXP4XX_NPE
tristate "IXP4xx Network Processor Engine support" tristate "IXP4xx Network Processor Engine support"
select FW_LOADER select FW_LOADER
select HOTPLUG
help help
This driver supports IXP4xx built-in network coprocessors This driver supports IXP4xx built-in network coprocessors
and is automatically selected by Ethernet and HSS drivers. and is automatically selected by Ethernet and HSS drivers.

View file

@ -253,7 +253,7 @@ config NR_CPUS
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs" bool "Support for hot-pluggable CPUs"
depends on SMP && HOTPLUG depends on SMP
default y default y
config BF_REV_MIN config BF_REV_MIN

View file

@ -617,7 +617,6 @@ config ETRAX_PV_CHANGEABLE_BITS
config ETRAX_CARDBUS config ETRAX_CARDBUS
bool "Cardbus support" bool "Cardbus support"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
select HOTPLUG
help help
Enabled the ETRAX Cardbus driver. Enabled the ETRAX Cardbus driver.

View file

@ -376,7 +376,6 @@ config NR_CPUS
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs" bool "Support for hot-pluggable CPUs"
depends on SMP depends on SMP
select HOTPLUG
default n default n
---help--- ---help---
Say Y here to experiment with turning CPUs off and on. CPUs Say Y here to experiment with turning CPUs off and on. CPUs

View file

@ -962,7 +962,7 @@ config SYS_HAS_EARLY_PRINTK
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs" bool "Support for hot-pluggable CPUs"
depends on SMP && HOTPLUG && SYS_SUPPORTS_HOTPLUG_CPU depends on SMP && SYS_SUPPORTS_HOTPLUG_CPU
help help
Say Y here to allow turning CPUs off and on. CPUs can be Say Y here to allow turning CPUs off and on. CPUs can be
controlled through /sys/devices/system/cpu. controlled through /sys/devices/system/cpu.

View file

@ -254,7 +254,6 @@ config IRQSTACKS
config HOTPLUG_CPU config HOTPLUG_CPU
bool bool
default y if SMP default y if SMP
select HOTPLUG
config ARCH_SELECT_MEMORY_MODEL config ARCH_SELECT_MEMORY_MODEL
def_bool y def_bool y

View file

@ -341,7 +341,7 @@ config SWIOTLB
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for enabling/disabling CPUs" 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)) PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
---help--- ---help---
Say Y here to be able to disable and re-enable individual Say Y here to be able to disable and re-enable individual

View file

@ -183,8 +183,8 @@ void tlb_flush(struct mmu_gather *tlb)
* since 64K pages may overlap with other bridges when using 64K pages * since 64K pages may overlap with other bridges when using 64K pages
* with 4K HW pages on IO space. * with 4K HW pages on IO space.
* *
* Because of that usage pattern, it's only available with CONFIG_HOTPLUG * Because of that usage pattern, it is implemented for small size rather
* and is implemented for small size rather than speed. * than speed.
*/ */
void __flush_hash_table_range(struct mm_struct *mm, unsigned long start, void __flush_hash_table_range(struct mm_struct *mm, unsigned long start,
unsigned long end) unsigned long end)

View file

@ -301,7 +301,6 @@ config HOTPLUG_CPU
def_bool y def_bool y
prompt "Support for hot-pluggable CPUs" prompt "Support for hot-pluggable CPUs"
depends on SMP depends on SMP
select HOTPLUG
help help
Say Y here to be able to turn CPUs off and on. CPUs Say Y here to be able to turn CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu/cpu#. can be controlled through /sys/devices/system/cpu/cpu#.

View file

@ -748,7 +748,7 @@ config NR_CPUS
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
depends on SMP && HOTPLUG depends on SMP
help help
Say Y here to experiment with turning CPUs off and on. CPUs Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu. can be controlled through /sys/devices/system/cpu.

View file

@ -243,7 +243,6 @@ config SECCOMP
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs" bool "Support for hot-pluggable CPUs"
depends on SPARC64 && SMP depends on SPARC64 && SMP
select HOTPLUG
help help
Say Y here to experiment with turning CPUs off and on. CPUs Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu/cpu#. can be controlled through /sys/devices/system/cpu/cpu#.

View file

@ -1725,7 +1725,7 @@ config PHYSICAL_ALIGN
config HOTPLUG_CPU config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs" bool "Support for hot-pluggable CPUs"
depends on SMP && HOTPLUG depends on SMP
---help--- ---help---
Say Y here to allow turning CPUs off and on. CPUs can be Say Y here to allow turning CPUs off and on. CPUs can be
controlled through /sys/devices/system/cpu. controlled through /sys/devices/system/cpu.

View file

@ -2,7 +2,6 @@ menu "Generic Driver Options"
config UEVENT_HELPER_PATH config UEVENT_HELPER_PATH
string "path to uevent helper" string "path to uevent helper"
depends on HOTPLUG
default "" default ""
help help
Path to uevent helper program forked by the kernel for Path to uevent helper program forked by the kernel for
@ -23,7 +22,6 @@ config UEVENT_HELPER_PATH
config DEVTMPFS config DEVTMPFS
bool "Maintain a devtmpfs filesystem to mount at /dev" bool "Maintain a devtmpfs filesystem to mount at /dev"
depends on HOTPLUG
help help
This creates a tmpfs/ramfs filesystem instance early at bootup. This creates a tmpfs/ramfs filesystem instance early at bootup.
In this filesystem, the kernel driver core maintains device In this filesystem, the kernel driver core maintains device

View file

@ -3,7 +3,7 @@
# #
menu "PCMCIA character devices" menu "PCMCIA character devices"
depends on HOTPLUG && PCMCIA!=n depends on PCMCIA!=n
config SYNCLINK_CS config SYNCLINK_CS
tristate "SyncLink PC Card support" tristate "SyncLink PC Card support"

View file

@ -145,7 +145,7 @@ config EDAC_E7XXX
config EDAC_E752X config EDAC_E752X
tristate "Intel e752x (e7520, e7525, e7320) and 3100" tristate "Intel e752x (e7520, e7525, e7320) and 3100"
depends on EDAC_MM_EDAC && PCI && X86 && HOTPLUG depends on EDAC_MM_EDAC && PCI && X86
help help
Support for error detection and correction on the Intel Support for error detection and correction on the Intel
E7520, E7525, E7320 server chipsets. E7520, E7525, E7320 server chipsets.

View file

@ -55,7 +55,6 @@ config PCI_STUB
config XEN_PCIDEV_FRONTEND config XEN_PCIDEV_FRONTEND
tristate "Xen PCI Frontend" tristate "Xen PCI Frontend"
depends on PCI && X86 && XEN depends on PCI && X86 && XEN
select HOTPLUG
select PCI_XEN select PCI_XEN
select XEN_XENBUS_FRONTEND select XEN_XENBUS_FRONTEND
default y default y
@ -113,7 +112,6 @@ config PCI_IOAPIC
tristate "PCI IO-APIC hotplug support" if X86 tristate "PCI IO-APIC hotplug support" if X86
depends on PCI depends on PCI
depends on ACPI depends on ACPI
depends on HOTPLUG
default !X86 default !X86
config PCI_LABEL config PCI_LABEL

View file

@ -4,7 +4,7 @@
menuconfig HOTPLUG_PCI menuconfig HOTPLUG_PCI
tristate "Support for PCI Hotplug" tristate "Support for PCI Hotplug"
depends on PCI && HOTPLUG && SYSFS depends on PCI && SYSFS
---help--- ---help---
Say Y here if you have a motherboard with a PCI Hotplug controller. 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 This allows you to add and remove PCI cards while the machine is

View file

@ -4,7 +4,6 @@
menuconfig PCCARD menuconfig PCCARD
tristate "PCCard (PCMCIA/CardBus) support" tristate "PCCard (PCMCIA/CardBus) support"
depends on HOTPLUG
---help--- ---help---
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux 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, computer. These are credit-card size devices such as network cards,

View 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 for custom-built kernels, the following options need to be enabled in the
kernel as built-in or modules: kernel as built-in or modules:
CONFIG_HOTPLUG - Support for hot-pluggable devices
CONFIG_MODULES - Enable loadable module support CONFIG_MODULES - Enable loadable module support
CONFIG_KMOD - Automatic kernel module loading CONFIG_KMOD - Automatic kernel module loading
CONFIG_FW_LOADER - Hotplug firmware loading support CONFIG_FW_LOADER - Hotplug firmware loading support

View file

@ -20,13 +20,12 @@ config GFS2_FS
be found here: http://sources.redhat.com/cluster be found here: http://sources.redhat.com/cluster
The "nolock" lock module is now built in to GFS2 by default. If 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 you want to use the DLM, be sure to enable IPv4/6 networking.
networking.
config GFS2_FS_LOCKING_DLM config GFS2_FS_LOCKING_DLM
bool "GFS2 DLM locking" bool "GFS2 DLM locking"
depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \ 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 help
Multiple node locking module for GFS2 Multiple node locking module for GFS2

View file

@ -68,14 +68,6 @@
* are handled as text/data or they can be discarded (which * are handled as text/data or they can be discarded (which
* often happens at runtime) * 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 #ifdef CONFIG_HOTPLUG_CPU
#define CPU_KEEP(sec) *(.cpu##sec) #define CPU_KEEP(sec) *(.cpu##sec)
#define CPU_DISCARD(sec) #define CPU_DISCARD(sec)
@ -182,8 +174,6 @@
*(.data) \ *(.data) \
*(.ref.data) \ *(.ref.data) \
*(.data..shared_aligned) /* percpu related */ \ *(.data..shared_aligned) /* percpu related */ \
DEV_KEEP(init.data) \
DEV_KEEP(exit.data) \
CPU_KEEP(init.data) \ CPU_KEEP(init.data) \
CPU_KEEP(exit.data) \ CPU_KEEP(exit.data) \
MEM_KEEP(init.data) \ MEM_KEEP(init.data) \
@ -372,8 +362,6 @@
/* __*init sections */ \ /* __*init sections */ \
__init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \ __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \
*(.ref.rodata) \ *(.ref.rodata) \
DEV_KEEP(init.rodata) \
DEV_KEEP(exit.rodata) \
CPU_KEEP(init.rodata) \ CPU_KEEP(init.rodata) \
CPU_KEEP(exit.rodata) \ CPU_KEEP(exit.rodata) \
MEM_KEEP(init.rodata) \ MEM_KEEP(init.rodata) \
@ -416,8 +404,6 @@
*(.text.hot) \ *(.text.hot) \
*(.text) \ *(.text) \
*(.ref.text) \ *(.ref.text) \
DEV_KEEP(init.text) \
DEV_KEEP(exit.text) \
CPU_KEEP(init.text) \ CPU_KEEP(init.text) \
CPU_KEEP(exit.text) \ CPU_KEEP(exit.text) \
MEM_KEEP(init.text) \ MEM_KEEP(init.text) \
@ -503,7 +489,6 @@
/* init and exit section handling */ /* init and exit section handling */
#define INIT_DATA \ #define INIT_DATA \
*(.init.data) \ *(.init.data) \
DEV_DISCARD(init.data) \
CPU_DISCARD(init.data) \ CPU_DISCARD(init.data) \
MEM_DISCARD(init.data) \ MEM_DISCARD(init.data) \
KERNEL_CTORS() \ KERNEL_CTORS() \
@ -511,7 +496,6 @@
*(.init.rodata) \ *(.init.rodata) \
FTRACE_EVENTS() \ FTRACE_EVENTS() \
TRACE_SYSCALLS() \ TRACE_SYSCALLS() \
DEV_DISCARD(init.rodata) \
CPU_DISCARD(init.rodata) \ CPU_DISCARD(init.rodata) \
MEM_DISCARD(init.rodata) \ MEM_DISCARD(init.rodata) \
CLK_OF_TABLES() \ CLK_OF_TABLES() \
@ -521,14 +505,11 @@
#define INIT_TEXT \ #define INIT_TEXT \
*(.init.text) \ *(.init.text) \
DEV_DISCARD(init.text) \
CPU_DISCARD(init.text) \ CPU_DISCARD(init.text) \
MEM_DISCARD(init.text) MEM_DISCARD(init.text)
#define EXIT_DATA \ #define EXIT_DATA \
*(.exit.data) \ *(.exit.data) \
DEV_DISCARD(exit.data) \
DEV_DISCARD(exit.rodata) \
CPU_DISCARD(exit.data) \ CPU_DISCARD(exit.data) \
CPU_DISCARD(exit.rodata) \ CPU_DISCARD(exit.rodata) \
MEM_DISCARD(exit.data) \ MEM_DISCARD(exit.data) \
@ -536,7 +517,6 @@
#define EXIT_TEXT \ #define EXIT_TEXT \
*(.exit.text) \ *(.exit.text) \
DEV_DISCARD(exit.text) \
CPU_DISCARD(exit.text) \ CPU_DISCARD(exit.text) \
MEM_DISCARD(exit.text) MEM_DISCARD(exit.text)

View file

@ -1244,9 +1244,6 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation. the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference see arch/parisc/kernel/unaligned.c for reference
config HOTPLUG
def_bool y
config HAVE_PCSPKR_PLATFORM config HAVE_PCSPKR_PLATFORM
bool bool

View file

@ -100,7 +100,6 @@ config PM_SLEEP_SMP
depends on SMP depends on SMP
depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP depends on PM_SLEEP
select HOTPLUG
select HOTPLUG_CPU select HOTPLUG_CPU
config PM_AUTOSLEEP config PM_AUTOSLEEP

View file

@ -173,7 +173,7 @@ config HAVE_BOOTMEM_INFO_NODE
config MEMORY_HOTPLUG config MEMORY_HOTPLUG
bool "Allow for memory hot-add" bool "Allow for memory hot-add"
depends on SPARSEMEM || X86_64_ACPI_NUMA 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) depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390)
config MEMORY_HOTPLUG_SPARSE config MEMORY_HOTPLUG_SPARSE