Messages in this thread Patch in this message | | | Subject | [RFC][PATCH 8/12] generic timeofday i386 arch specific changes, part 4 | From | john stultz <> | Date | Tue, 01 Nov 2005 14:32:14 -0800 |
| |
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-rc5-mm1_timeofday-arch-i386-part4_B9.patch ============================================ diff -ruN linux-2.6-mmtod/arch/i386/kernel/acpi/boot.c mm-fixups/arch/i386/kernel/acpi/boot.c --- linux-2.6-mmtod/arch/i386/kernel/acpi/boot.c 2005-10-31 17:22:37.000000000 -0800 +++ mm-fixups/arch/i386/kernel/acpi/boot.c 2005-10-31 18:02:44.000000000 -0800 @@ -615,7 +615,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) @@ -643,21 +644,21 @@ 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) + if (acpi_pmtmr_ioport) printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", - pmtmr_ioport); + 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/
| |