lkml.org 
[lkml]   [2010]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v2 11/12] ACPI: processor: push file static MADT pointer into internal map_madt_entry()
    From
    Date
    There's no real need for a pointer to the MADT to be global. The only
    function who uses it is map_madt_entry.

    This allows us to remove some more ugly #ifdefs.

    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    ---

    drivers/acpi/processor_core.c | 18 +++++++++---------
    1 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
    index ee9bce1..791ac7b 100644
    --- a/drivers/acpi/processor_core.c
    +++ b/drivers/acpi/processor_core.c
    @@ -43,8 +43,6 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
    };

    #ifdef CONFIG_SMP
    -static struct acpi_table_madt *madt;
    -
    static int map_lapic_id(struct acpi_subtable_header *entry,
    u32 acpi_id, int *apic_id)
    {
    @@ -100,8 +98,17 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
    static int map_madt_entry(int type, u32 acpi_id)
    {
    unsigned long madt_end, entry;
    + static struct acpi_table_madt *madt;
    + static int read_madt;
    int apic_id = -1;

    + if (!read_madt) {
    + if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
    + (struct acpi_table_header **)&madt)))
    + madt = NULL;
    + read_madt++;
    + }
    +
    if (!madt)
    return apic_id;

    @@ -335,13 +342,6 @@ early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)

    void __init acpi_early_processor_set_pdc(void)
    {
    -
    -#ifdef CONFIG_SMP
    - if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
    - (struct acpi_table_header **)&madt)))
    - madt = NULL;
    -#endif
    -
    /*
    * Check whether the system is DMI table. If yes, OSPM
    * should not use mwait for CPU-states.


    \
     
     \ /
      Last update: 2010-02-22 20:15    [W:0.021 / U:30.076 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site