[-mm PATCH 9/11] Time: i386 conversion part 3 - backout pmtmr changes

Backout pmtmr_ioport changes to avoid conflicting w/ x86-64

Signed-off-by: John Stultz <[email protected]>

 arch/i386/kernel/acpi/boot.c |    2 +-
 arch/i386/kernel/time.c      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: mm-merge/arch/i386/kernel/acpi/boot.c
===================================================================
--- mm-merge.orig/arch/i386/kernel/acpi/boot.c
+++ mm-merge/arch/i386/kernel/acpi/boot.c
@@ -616,7 +616,7 @@ static int __init acpi_parse_hpet(unsign
 #endif
 
 #ifdef CONFIG_X86_PM_TIMER
-u32 pmtmr_ioport;
+extern u32 pmtmr_ioport;
 #endif
 
 static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• References:
  • [-mm PATCHSET 0/11] Sync -mm w/ B19 timekeeping patches
    • From: john stultz <[email protected]>

• Prev by Date: [-mm PATCH 7/11] Time: generic timekeeping infrastructure - wall_offset helper cleanup
• Next by Date: [PATCH 0/6] PCI legacy I/O port free driver (take2)
• Previous by thread: [-mm PATCH 7/11] Time: generic timekeeping infrastructure - wall_offset helper cleanup
• Next by thread: [PATCH 0/6] PCI legacy I/O port free driver (take2)
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]