On Fri, Jul 5, 2019 at 10:18 PM Dexuan Cui <decui@xxxxxxxxxxxxx> wrote: > > > If CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT is not set, the dummy version of > the function should be static. > > Fixes: 1e2c3f0f1e93 ("ACPI: PM: Make acpi_sleep_state_supported() non-static") > Signed-off-by: Dexuan Cui <decui@xxxxxxxxxxxxx> > Reported-by: kbuild test robot <lkp@xxxxxxxxx> > --- > > Sorry for not doing it right in the previous patch! > > The patch fixes the build errors on ARM64: > > drivers/net/ethernet/qualcomm/emac/emac-phy.o: In function `acpi_sleep_state_supported': > >> emac-phy.c:(.text+0x1d8): multiple definition of `acpi_sleep_state_supported' > drivers/net/ethernet/qualcomm/emac/emac.o:emac.c:(.text+0xbf8): first defined here > drivers/net/ethernet/qualcomm/emac/emac-sgmii.o: In function `acpi_sleep_state_supported': > emac-sgmii.c:(.text+0x548): multiple definition of `acpi_sleep_state_supported' > drivers/net/ethernet/qualcomm/emac/emac.o:emac.c:(.text+0xbf8): first defined here > > > include/acpi/acpi_bus.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h > index 4ce59bdc852e..8ffc4acf2b56 100644 > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -657,7 +657,7 @@ static inline int acpi_pm_set_bridge_wakeup(struct device *dev, bool enable) > #ifdef CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT > bool acpi_sleep_state_supported(u8 sleep_state); > #else > -bool acpi_sleep_state_supported(u8 sleep_state) { return false; } > +static bool acpi_sleep_state_supported(u8 sleep_state) { return false; } This should be static inline even. I've reapplied the original patch with this change folded in. Thanks!