git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp...
[safe/jmp/linux-2.6]
/
drivers
/
clocksource
/
acpi_pm.c
diff --git
a/drivers/clocksource/acpi_pm.c
b/drivers/clocksource/acpi_pm.c
index
71d2ac4
..
c201710
100644
(file)
--- 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;
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",
printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",
-
(unsigned int)
pmtmr_ioport, base);
+ pmtmr_ioport, base);
pmtmr_ioport = base;
return 1;
pmtmr_ioport = base;
return 1;