On Fri, Sep 14, 2012 at 02:53:11PM -0600, Bjorn Helgaas wrote: > +cc Greg KH > > On Fri, Sep 14, 2012 at 2:44 PM, Thierry Reding > <thierry.reding@xxxxxxxxxxxxxxxxx> wrote: > > In order to keep pci_fixup_irqs() around after init (e.g. for hotplug), > > mark it __devinit instead of __init. This requires the same change for > > the implementation of the pcibios_update_irq() function on all > > architectures. > > > > Signed-off-by: Thierry Reding <thierry.reding@xxxxxxxxxxxxxxxxx> > > --- > > Note: Ideally these annotations should go away completely in order to > > be independent of the HOTPLUG symbol. However, there is work underway > > to get rid of HOTPLUG altogether, so I've kept the __devinit for now. No, just take away the __init marking completly. For 3.7, CONFIG_HOTPLUG will always be enabled, making it be the same thing. That way this saves me the time and energy from deleting the __devinit markings when I get to that point in the patch series :) thanks, greg k-h