| Message ID | 1353349642-3677-22-git-send-email-wfp5p@virginia.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 19, 2012 at 01:19:31PM -0500, Bill Pemberton wrote: > diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c > index 9b72261..f136307 100644 > --- a/arch/arm/kernel/bios32.c > +++ b/arch/arm/kernel/bios32.c > @@ -361,9 +361,9 @@ void pcibios_fixup_bus(struct pci_bus *bus) > printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n", > bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis"); > } > -#ifdef CONFIG_HOTPLUG > + > EXPORT_SYMBOL(pcibios_fixup_bus); > -#endif > + This looks fine. > diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S > index b9f38e3..38279fe 100644 > --- a/arch/arm/kernel/vmlinux.lds.S > +++ b/arch/arm/kernel/vmlinux.lds.S > @@ -66,10 +66,8 @@ 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 This to me looks wrong. Do we want to unconditionally discard devexit debugging? > diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h > index d1ea7ce..856b58d 100644 > --- a/include/asm-generic/vmlinux.lds.h > +++ b/include/asm-generic/vmlinux.lds.h > @@ -74,13 +74,8 @@ > * 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) I hope there will be a follow-on patch to remove the DEV_KEEP() and DEV_DISCARD() stuff entirely?
Russell King - ARM Linux writes: > > > diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S > > index b9f38e3..38279fe 100644 > > --- a/arch/arm/kernel/vmlinux.lds.S > > +++ b/arch/arm/kernel/vmlinux.lds.S > > @@ -66,10 +66,8 @@ 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 > > This to me looks wrong. Do we want to unconditionally discard devexit > debugging? > Whoa, yeah, that's not right. I got it backwards. The right fix gets rid of all those devexit lines as devexit will be going away. Should I just redo this patch or send an additional one that removes those 2 lines? > > diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h > > index d1ea7ce..856b58d 100644 > > --- a/include/asm-generic/vmlinux.lds.h > > +++ b/include/asm-generic/vmlinux.lds.h > > @@ -74,13 +74,8 @@ > > * 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) > > I hope there will be a follow-on patch to remove the DEV_KEEP() and > DEV_DISCARD() stuff entirely? > Yes, once hotplug is truly gone these can also go away.
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 9b72261..f136307 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -361,9 +361,9 @@ void pcibios_fixup_bus(struct pci_bus *bus) printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n", bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis"); } -#ifdef CONFIG_HOTPLUG + EXPORT_SYMBOL(pcibios_fixup_bus); -#endif + /* * Swizzle the device pin each time we cross a bridge. If a platform does diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index b9f38e3..38279fe 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -66,10 +66,8 @@ 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) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index d1ea7ce..856b58d 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -74,13 +74,8 @@ * 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)
Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Russell King <linux@arm.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arch@vger.kernel.org --- arch/arm/kernel/bios32.c | 4 ++-- arch/arm/kernel/vmlinux.lds.S | 2 -- include/asm-generic/vmlinux.lds.h | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-)