* [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs
[not found] <1353349642-3677-1-git-send-email-wfp5p@virginia.edu>
@ 2012-11-19 18:19 ` Bill Pemberton
2012-11-19 18:19 ` Bill Pemberton
2012-11-21 11:44 ` Russell King - ARM Linux
2012-11-19 18:24 ` [PATCH 291/493] asm-generic: remove use of __devinit Bill Pemberton
1 sibling, 2 replies; 5+ messages in thread
From: Bill Pemberton @ 2012-11-19 18:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-arch, Russell King, linux-arm-kernel, Arnd Bergmann
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(-)
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)
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs
2012-11-19 18:19 ` [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs Bill Pemberton
@ 2012-11-19 18:19 ` Bill Pemberton
2012-11-21 11:44 ` Russell King - ARM Linux
1 sibling, 0 replies; 5+ messages in thread
From: Bill Pemberton @ 2012-11-19 18:19 UTC (permalink / raw)
To: gregkh; +Cc: Russell King, Arnd Bergmann, linux-arm-kernel, linux-arch
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(-)
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)
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 291/493] asm-generic: remove use of __devinit
[not found] <1353349642-3677-1-git-send-email-wfp5p@virginia.edu>
2012-11-19 18:19 ` [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs Bill Pemberton
@ 2012-11-19 18:24 ` Bill Pemberton
1 sibling, 0 replies; 5+ messages in thread
From: Bill Pemberton @ 2012-11-19 18:24 UTC (permalink / raw)
To: gregkh; +Cc: Arnd Bergmann, linux-arch
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
---
include/asm-generic/parport.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/asm-generic/parport.h b/include/asm-generic/parport.h
index 40528cb..2c9f9d4 100644
--- a/include/asm-generic/parport.h
+++ b/include/asm-generic/parport.h
@@ -10,8 +10,8 @@
* to devices on the PCI bus.
*/
-static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma);
-static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma)
+static int parport_pc_find_isa_ports(int autoirq, int autodma);
+static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
{
#ifdef CONFIG_ISA
return parport_pc_find_isa_ports(autoirq, autodma);
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs
2012-11-19 18:19 ` [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs Bill Pemberton
2012-11-19 18:19 ` Bill Pemberton
@ 2012-11-21 11:44 ` Russell King - ARM Linux
2012-11-21 18:35 ` Bill Pemberton
1 sibling, 1 reply; 5+ messages in thread
From: Russell King - ARM Linux @ 2012-11-21 11:44 UTC (permalink / raw)
To: Bill Pemberton; +Cc: gregkh, Arnd Bergmann, linux-arm-kernel, linux-arch
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?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs
2012-11-21 11:44 ` Russell King - ARM Linux
@ 2012-11-21 18:35 ` Bill Pemberton
0 siblings, 0 replies; 5+ messages in thread
From: Bill Pemberton @ 2012-11-21 18:35 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: gregkh, Arnd Bergmann, linux-arm-kernel, linux-arch
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.
--
Bill
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-21 18:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1353349642-3677-1-git-send-email-wfp5p@virginia.edu>
2012-11-19 18:19 ` [PATCH 022/493] ARM: remove CONFIG_HOTPLUG ifdefs Bill Pemberton
2012-11-19 18:19 ` Bill Pemberton
2012-11-21 11:44 ` Russell King - ARM Linux
2012-11-21 18:35 ` Bill Pemberton
2012-11-19 18:24 ` [PATCH 291/493] asm-generic: remove use of __devinit Bill Pemberton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).