lkml.org 
[lkml]   [2014]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 068/139] ACPI: Fix conflict between customized DSDT and DSDT local copy
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Lv Zheng <lv.zheng@intel.com>

    commit 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 upstream.

    This patch fixes the following issue:
    If DSDT is customized, no local DSDT copy is needed.

    References: https://bugzilla.kernel.org/show_bug.cgi?id=69711
    Signed-off-by: Enrico Etxe Arte <goitizena.generoa@gmail.com>
    Signed-off-by: Lv Zheng <lv.zheng@intel.com>
    [rjw: Subject]
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/bus.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- 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 dm
    acpi_gbl_copy_dsdt_locally = 1;
    return 0;
    }
    +#endif

    static struct dmi_system_id dsdt_dmi_table[] __initdata = {
    /*



    \
     
     \ /
      Last update: 2014-06-28 21:21    [W:4.145 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site