diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-20 23:49:35 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-03 17:20:18 -0400 |
commit | 40b313608ad4ea655addd2ec6cdd106477ae8e15 (patch) | |
tree | 371f6ad524c7d85901bc9002ff2960ea10cb5154 /arch/arm/kernel/module.c | |
parent | af5bc11e9aa19f72a2d5ccd44611cb6268a60a34 (diff) |
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>
Diffstat (limited to 'arch/arm/kernel/module.c')
-rw-r--r-- | arch/arm/kernel/module.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 1e9be5d25e56..85c3fb6c93c2 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
@@ -288,24 +288,16 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, | |||
288 | 288 | ||
289 | if (strcmp(".ARM.exidx.init.text", secname) == 0) | 289 | if (strcmp(".ARM.exidx.init.text", secname) == 0) |
290 | maps[ARM_SEC_INIT].unw_sec = s; | 290 | maps[ARM_SEC_INIT].unw_sec = s; |
291 | else if (strcmp(".ARM.exidx.devinit.text", secname) == 0) | ||
292 | maps[ARM_SEC_DEVINIT].unw_sec = s; | ||
293 | else if (strcmp(".ARM.exidx", secname) == 0) | 291 | else if (strcmp(".ARM.exidx", secname) == 0) |
294 | maps[ARM_SEC_CORE].unw_sec = s; | 292 | maps[ARM_SEC_CORE].unw_sec = s; |
295 | else if (strcmp(".ARM.exidx.exit.text", secname) == 0) | 293 | else if (strcmp(".ARM.exidx.exit.text", secname) == 0) |
296 | maps[ARM_SEC_EXIT].unw_sec = s; | 294 | maps[ARM_SEC_EXIT].unw_sec = s; |
297 | else if (strcmp(".ARM.exidx.devexit.text", secname) == 0) | ||
298 | maps[ARM_SEC_DEVEXIT].unw_sec = s; | ||
299 | else if (strcmp(".init.text", secname) == 0) | 295 | else if (strcmp(".init.text", secname) == 0) |
300 | maps[ARM_SEC_INIT].txt_sec = s; | 296 | maps[ARM_SEC_INIT].txt_sec = s; |
301 | else if (strcmp(".devinit.text", secname) == 0) | ||
302 | maps[ARM_SEC_DEVINIT].txt_sec = s; | ||
303 | else if (strcmp(".text", secname) == 0) | 297 | else if (strcmp(".text", secname) == 0) |
304 | maps[ARM_SEC_CORE].txt_sec = s; | 298 | maps[ARM_SEC_CORE].txt_sec = s; |
305 | else if (strcmp(".exit.text", secname) == 0) | 299 | else if (strcmp(".exit.text", secname) == 0) |
306 | maps[ARM_SEC_EXIT].txt_sec = s; | 300 | maps[ARM_SEC_EXIT].txt_sec = s; |
307 | else if (strcmp(".devexit.text", secname) == 0) | ||
308 | maps[ARM_SEC_DEVEXIT].txt_sec = s; | ||
309 | } | 301 | } |
310 | 302 | ||
311 | for (i = 0; i < ARM_SEC_MAX; i++) | 303 | for (i = 0; i < ARM_SEC_MAX; i++) |