Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 71d2ac4e3f46..c20171078d1d 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -237,9 +237,12 @@ static int __init parse_pmtmr(char *arg)
 
         if (strict_strtoul(arg, 16, &base))
                 return -EINVAL;
-
+#ifdef CONFIG_X86_64
+        if (base > UINT_MAX)
+                return -ERANGE;
+#endif
         printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",
-               (unsigned int)pmtmr_ioport, base);
+               pmtmr_ioport, base);
         pmtmr_ioport = base;
 
         return 1;