lkml.org 
[lkml]   [2006]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 9/10] Time: i386 Conversion - part 5: ACPI PM variable renaming and config change.
    	This cleans up some of the variable names used in the old ACPI 
    PM timer_opts code. Specifically, it renames pmtmr_ioport and removes
    the CONFIG_X86_PM_TIMER option.

    thanks
    -john

    Signed-off-by: John Stultz <johnstul@us.ibm.com>

    arch/i386/kernel/acpi/boot.c | 22 ++++++++++------------
    drivers/acpi/Kconfig | 18 ------------------
    drivers/acpi/osl.c | 2 --
    3 files changed, 10 insertions(+), 32 deletions(-)

    linux-2.6.15-rc5_timeofday-arch-i386-part5_B15.patch
    ============================================
    diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
    index 2a3db1a..e3318f4 100644
    --- a/arch/i386/kernel/acpi/boot.c
    +++ b/arch/i386/kernel/acpi/boot.c
    @@ -608,9 +608,8 @@ static int __init acpi_parse_hpet(unsign
    #define acpi_parse_hpet NULL
    #endif

    -#ifdef CONFIG_X86_PM_TIMER
    -u32 pmtmr_ioport;
    -#endif
    +u32 acpi_pmtmr_ioport;
    +int acpi_pmtmr_buggy;

    static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
    {
    @@ -629,7 +628,6 @@ static int __init acpi_parse_fadt(unsign
    acpi_fadt.force_apic_physical_destination_mode =
    fadt->force_apic_physical_destination_mode;

    -#ifdef CONFIG_X86_PM_TIMER
    /* detect the location of the ACPI PM Timer */
    if (fadt->revision >= FADT2_REVISION_ID) {
    /* FADT rev. 2 */
    @@ -637,22 +635,22 @@ static int __init acpi_parse_fadt(unsign
    ACPI_ADR_SPACE_SYSTEM_IO)
    return 0;

    - pmtmr_ioport = fadt->xpm_tmr_blk.address;
    + acpi_pmtmr_ioport = fadt->xpm_tmr_blk.address;
    /*
    * "X" fields are optional extensions to the original V1.0
    * fields, so we must selectively expand V1.0 fields if the
    * corresponding X field is zero.
    */
    - if (!pmtmr_ioport)
    - pmtmr_ioport = fadt->V1_pm_tmr_blk;
    + if (!acpi_pmtmr_ioport)
    + acpi_pmtmr_ioport = fadt->V1_pm_tmr_blk;
    } else {
    /* FADT rev. 1 */
    - pmtmr_ioport = fadt->V1_pm_tmr_blk;
    + acpi_pmtmr_ioport = fadt->V1_pm_tmr_blk;
    }
    - if (pmtmr_ioport)
    - printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n",
    - pmtmr_ioport);
    -#endif
    +
    + if (acpi_pmtmr_ioport)
    + printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", acpi_pmtmr_ioport);
    +
    return 0;
    }

    diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
    index fce21c2..45e6274 100644
    --- a/drivers/acpi/Kconfig
    +++ b/drivers/acpi/Kconfig
    @@ -287,24 +287,6 @@ config ACPI_SYSTEM
    This driver will enable your system to shut down using ACPI, and
    dump your ACPI DSDT table using /proc/acpi/dsdt.

    -config X86_PM_TIMER
    - bool "Power Management Timer Support"
    - depends on X86
    - depends on !X86_64
    - default y
    - help
    - The Power Management Timer is available on all ACPI-capable,
    - in most cases even if ACPI is unusable or blacklisted.
    -
    - This timing source is not affected by powermanagement features
    - like aggressive processor idling, throttling, frequency and/or
    - voltage scaling, unlike the commonly used Time Stamp Counter
    - (TSC) timing source.
    -
    - So, if you see messages like 'Losing too many ticks!' in the
    - kernel logs, and/or you are using this on a notebook which
    - does not yet have an HPET, you should say "Y" here.
    -
    config ACPI_CONTAINER
    tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"
    depends on EXPERIMENTAL
    diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
    index e3cd0b1..3f2021c 100644
    --- a/drivers/acpi/osl.c
    +++ b/drivers/acpi/osl.c
    @@ -346,9 +346,7 @@ u64 acpi_os_get_timer(void)
    /* TBD: use HPET if available */
    #endif

    -#ifdef CONFIG_X86_PM_TIMER
    /* TBD: default to PM timer if HPET was not available */
    -#endif
    if (!t)
    printk(KERN_ERR PREFIX "acpi_os_get_timer() TBD\n");

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-01-06 03:19    [W:0.033 / U:120.036 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site