Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964846AbVLBD3s (ORCPT ); Thu, 1 Dec 2005 22:29:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964839AbVLBD3r (ORCPT ); Thu, 1 Dec 2005 22:29:47 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:27563 "EHLO e32.co.us.ibm.com") by vger.kernel.org with ESMTP id S964829AbVLBD0x (ORCPT ); Thu, 1 Dec 2005 22:26:53 -0500 Date: Thu, 1 Dec 2005 20:26:50 -0700 From: john stultz To: lkml Cc: Ingo Molnar , Darren Hart , Nishanth Aravamudan , Frank Sorenson , George Anzinger , Roman Zippel , Ulrich Windl , Thomas Gleixner , john stultz , john stultz Message-Id: <20051202032649.19357.80508.sendpatchset@cog.beaverton.ibm.com> In-Reply-To: <20051202032551.19357.51421.sendpatchset@cog.beaverton.ibm.com> References: <20051202032551.19357.51421.sendpatchset@cog.beaverton.ibm.com> Subject: [PATCH 8/13] Time: i386 Conversion - part 4: ACPI PM variable renaming Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2088 Lines: 67 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 Signed-off-by: John Stultz boot.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) linux-2.6.15-rc3-mm1_timeofday-arch-i386-part4_B12.patch ========================== diff -ruN tod-mm1/arch/i386/kernel/acpi/boot.c tod-mm2/arch/i386/kernel/acpi/boot.c --- tod-mm1/arch/i386/kernel/acpi/boot.c 2005-12-01 18:12:56.000000000 -0800 +++ tod-mm2/arch/i386/kernel/acpi/boot.c 2005-12-01 18:25:30.000000000 -0800 @@ -609,7 +609,8 @@ #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) @@ -637,21 +638,22 @@ 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); + + 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/