[RFC][PATCH 8/11] generic timeofday i386 arch specific changes, part 4

From: john stultz (johnstul_at_us.ibm.com)
Date: 09/30/05

  • Next message: Rohit Seth: "Re: [PATCH] earlier allocation of order 0 pages from pcp in __alloc_pages" 
    To: lkml <linux-kernel@vger.kernel.org>
Date:	Thu, 29 Sep 2005 17:50:39 -0700

    All,
            The conversion of i386 to use the generic timeofday subsystem has been
    split into 6 parts. This patch, the fourth of six, renames some ACPI PM
    variables.

    It applies on top of my timeofday-arch-i386-part3 patch. This patch is
    part the timeofday-arch-i386 patchset, so without the following parts it
    is not expected to compile.
            
    thanks
    -john

     boot.c | 14 ++++++++------
     1 files changed, 8 insertions(+), 6 deletions(-)

    linux-2.6.14-rc2_timeofday-arch-i386-part4_B6.patch
    ============================================
    diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
    --- a/arch/i386/kernel/acpi/boot.c
    +++ b/arch/i386/kernel/acpi/boot.c
    @@ -612,7 +612,8 @@ static int __init acpi_parse_hpet(unsign
     #endif
     
     #ifdef CONFIG_X86_PM_TIMER
    -extern u32 pmtmr_ioport;
    +u32 acpi_pmtmr_ioport;
    +int acpi_pmtmr_buggy;
     #endif
     
     static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
    @@ -640,14 +641,15 @@ 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;
             } 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);
    +
    + if (acpi_pmtmr_ioport)
    + printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", acpi_pmtmr_ioport);
    +
     #endif
             return 0;
     }

    -
    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/

  • Next message: Rohit Seth: "Re: [PATCH] earlier allocation of order 0 pages from pcp in __alloc_pages"

    Relevant Pages