Shaohua Li wrote: > There is an IA64 system here which have two pci root bridges with _OSC. > One _OSC disables SHPC control bit but the other not. Below patch makes > _OSC data per-device instead of one global, otherwise linux takes both > root bridges don't support SHPC > > Signed-off-by: Shaohua Li <shaohua.li@xxxxxxxxx> > > diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c > index 72f7476..8f17064 100644 > --- a/drivers/pci/pci-acpi.c > +++ b/drivers/pci/pci-acpi.c > @@ -19,8 +19,29 @@ > #include <linux/pci-acpi.h> > #include "pci.h" > > -static u32 ctrlset_buf[3] = {0, 0, 0}; > -static u32 global_ctrlsets = 0; > +#define MAX_ACPI_OSC 30 /* Should be enough */ > +struct acpi_osc_data { > + acpi_handle handle; > + u32 ctrlset_buf[3]; > + u32 global_ctrlsets; > +} acpi_osc_data_array[MAX_ACPI_OSC]; > + > +struct acpi_osc_data *acpi_get_osc_data(acpi_handle handle) > +{ One nit pick. I think this should be static. Thanks, Kenji Kaneshige -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html