On Friday, May 09, 2014 04:44:19 PM Lv Zheng wrote: > This patch fixes the following issue: > If DSDT is customized, no local DSDT copy is needed. > > Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=69711 > Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx> > Signed-off-by: Enrico Etxe Arte <goitizena.generoa@xxxxxxxxx> This can go in without [1/2], right? If so, do we need it in -stable? > --- > drivers/acpi/bus.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > index 610261a..cfd2318 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -52,6 +52,12 @@ struct proc_dir_entry *acpi_root_dir; > EXPORT_SYMBOL(acpi_root_dir); > > #ifdef CONFIG_X86 > +#ifdef CONFIG_ACPI_CUSTOM_DSDT > +static inline int set_copy_dsdt(const struct dmi_system_id *id) > +{ > + return 0; > +} > +#else > static int set_copy_dsdt(const struct dmi_system_id *id) > { > printk(KERN_NOTICE "%s detected - " > @@ -59,6 +65,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id) > acpi_gbl_copy_dsdt_locally = 1; > return 0; > } > +#endif > > static struct dmi_system_id dsdt_dmi_table[] __initdata = { > /* > -- 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
