[Git pull] timer updates

[Thomas Gleixner <tglx@linutronix.de>]

Linus,

Please pull the latest timers/for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers/for-linus

 Thanks,

	tglx

------------------>

Randy Dunlap (1):
      acpi_pm: re-fix printk format


 drivers/clocksource/acpi_pm.c |    6 +++---
 include/linux/acpi_pmtmr.h    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 5ca1d80..0f38b1b 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -28,7 +28,7 @@
  * The location is detected during setup_arch(),
  * in arch/i386/kernel/acpi/boot.c
  */
-u32 pmtmr_ioport __read_mostly;
+unsigned long pmtmr_ioport __read_mostly;
 
 static inline u32 read_pmtmr(void)
 {
@@ -227,8 +227,8 @@ static int __init parse_pmtmr(char *arg)
 	if (strict_strtoul(arg, 16, &base))
 		return -EINVAL;
 
-	printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",
-	       (unsigned int)pmtmr_ioport, base);
+	printk(KERN_INFO "PMTMR IOPort override: 0x%04lx -> 0x%04lx\n",
+	       pmtmr_ioport, base);
 	pmtmr_ioport = base;
 
 	return 1;
diff --git a/include/linux/acpi_pmtmr.h b/include/linux/acpi_pmtmr.h
index 7e3d285..503c7f7 100644
--- a/include/linux/acpi_pmtmr.h
+++ b/include/linux/acpi_pmtmr.h
@@ -15,7 +15,7 @@
 #ifdef CONFIG_X86_PM_TIMER
 
 extern u32 acpi_pm_read_verified(void);
-extern u32 pmtmr_ioport;
+extern unsigned long pmtmr_ioport;
 
 static inline u32 acpi_pm_read_early(void)
 {