Finally eradicate CONFIG_HOTPLUG

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>

1 files changed, 0 insertions, 20 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index eb58d2d7d971..4f2737208c42 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -68,14 +68,6 @@
  * 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)
@@ -182,8 +174,6 @@
         *(.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)                                             \
@@ -372,8 +362,6 @@
         /* __*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)                                   \
@@ -416,8 +404,6 @@
                 *(.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)                                             \
@@ -503,7 +489,6 @@
 /* init and exit section handling */
 #define INIT_DATA                                                       \
         *(.init.data)                                                   \
-        DEV_DISCARD(init.data)                                          \
         CPU_DISCARD(init.data)                                          \
         MEM_DISCARD(init.data)                                          \
         KERNEL_CTORS()                                                  \
@@ -511,7 +496,6 @@
         *(.init.rodata)                                                 \
         FTRACE_EVENTS()                                                 \
         TRACE_SYSCALLS()                                                \
-        DEV_DISCARD(init.rodata)                                        \
         CPU_DISCARD(init.rodata)                                        \
         MEM_DISCARD(init.rodata)                                        \
         CLK_OF_TABLES()                                                 \
@@ -521,14 +505,11 @@
 
 #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)                                          \
@@ -536,7 +517,6 @@
 
 #define EXIT_TEXT                                                       \
         *(.exit.text)                                                   \
-        DEV_DISCARD(exit.text)                                          \
         CPU_DISCARD(exit.text)                                          \
         MEM_DISCARD(exit.text)