On Tue, 28 Jul 2009 09:56:46 -0700
Jesse Barnes <jesse.barnes@xxxxxxxxx> wrote:
> On Mon, 27 Jul 2009 12:05:38 +0900
> Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx> wrote:
>
> > The commit bd3d99c17039fd05a29587db3f4a180c48da115a ("PCI: Remove
> > untested Electromechanical Interlock (EMI) support in pciehp."),
> > which removes the definition of "struct hotplug_slot_attr", broke
> > SGI hotplug driver. By this commit, we get the following compile
> > error.
> >
> >
> > drivers/pci/hotplug/sgi_hotplug.c:106: error: variable
> > 'sn_slot_path_attr' has initializer but incomplete type
> > drivers/pci/hotplug/sgi_hotplug.c:106: error: unknown field 'attr'
> > specified in initializer drivers/pci/hotplug/sgi_hotplug.c:106:
> > error: extra brace group at end of initializer
> > drivers/pci/hotplug/sgi_hotplug.c:106: error: (near initialization
> > for 'sn_slot_path_attr') drivers/pci/hotplug/sgi_hotplug.c:106:
> > warning: excess elements in struct initializer
> > drivers/pci/hotplug/sgi_hotplug.c:106: warning: (near initialization
> > for 'sn_slot_path_attr') drivers/pci/hotplug/sgi_hotplug.c:106:
> > error: unknown field 'show' specified in initializer
> > drivers/pci/hotplug/sgi_hotplug.c:106: warning: excess elements in
> > struct initializer drivers/pci/hotplug/sgi_hotplug.c:106: warning:
> > (near initialization for 'sn_slot_path_attr')
> > drivers/pci/hotplug/sgi_hotplug.c: In function 'sn_hp_destroy':
> > drivers/pci/hotplug/sgi_hotplug.c:203: error: invalid use of
> > undefined type 'struct hotplug_slot_attribute'
> > drivers/pci/hotplug/sgi_hotplug.c: In function
> > 'sn_hotplug_slot_register': drivers/pci/hotplug/sgi_hotplug.c:655:
> > error: invalid use of undefined type 'struct hotplug_slot_attribute'
> >
> >
> > This patch fixes this regression by adding the definition of struct
> > hotplug_slot_attr into sgi_hotplug.c.
> >
> > Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
> >
> > ---
> > drivers/pci/hotplug/sgi_hotplug.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
>
> Applied these two to linux-next for now, thanks.
Pulled these over to for-linus now that Mike has tested. I'll send
them to Linus in the next few days.
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
