On Tuesday, May 06, 2014 01:24:38 PM Bjorn Helgaas wrote:
> On Tue, May 6, 2014 at 5:28 AM, Rafael J. Wysocki <rjw@xxxxxxxxxxxxx> wrote:
> > On Tuesday, May 06, 2014 11:24:30 AM Hanjun Guo wrote:
> >> For pci_acpi_crs_quirks(), ia64 already doesn't use it, and we can
> >> not foresee it should be used in ARM64, so stub out pci_acpi_crs_quirks()
> >> to avoid introducing platform specific dummy stub function.
> >>
> >> Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
> >
> > Bjorn, what do you think?
>
> Looks OK to me. If you want to avoid the ifdef, we could put an empty
> weak version in pci_root.c. Either way,
>
> Reviewed-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
OK, I've queued this up for 3.16. Thanks!
> >> ---
> >> arch/ia64/include/asm/acpi.h | 1 -
> >> include/acpi/acpi_drivers.h | 5 +++++
> >> 2 files changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
> >> index d651102..97cb160 100644
> >> --- a/arch/ia64/include/asm/acpi.h
> >> +++ b/arch/ia64/include/asm/acpi.h
> >> @@ -92,7 +92,6 @@ ia64_acpi_release_global_lock (unsigned int *lock)
> >> #endif
> >> #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
> >> static inline void disable_acpi(void) { }
> >> -static inline void pci_acpi_crs_quirks(void) { }
> >>
> >> #ifdef CONFIG_IA64_GENERIC
> >> const char *acpi_get_sysname (void);
> >> diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
> >> index d504613..ea6428b 100644
> >> --- a/include/acpi/acpi_drivers.h
> >> +++ b/include/acpi/acpi_drivers.h
> >> @@ -96,7 +96,12 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle);
> >> /* Arch-defined function to add a bus to the system */
> >>
> >> struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root);
> >> +
> >> +#ifdef CONFIG_X86
> >> void pci_acpi_crs_quirks(void);
> >> +#else
> >> +static inline void pci_acpi_crs_quirks(void) { }
> >> +#endif
> >>
> >> /* --------------------------------------------------------------------------
> >> Processor
> >>
> >
> > --
> > I speak only for myself.
> > Rafael J. Wysocki, Intel Open Source Technology Center.
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
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
