[ARM] Off-by-one in arch/arm/common/icst*

[powerpc.git] / drivers / clocksource / acpi_pm.c

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index a0e5cde..7ad3be8 100644 (file)
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -30,9 +30,9 @@
  * The location is detected during setup_arch(),
  * in arch/i386/acpi/boot.c
  */
-u32 pmtmr_ioport;
+u32 pmtmr_ioport __read_mostly;
 
-#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */
+#define ACPI_PM_MASK CLOCKSOURCE_MASK(24) /* limit it to 24 bits */
 
 static inline u32 read_pmtmr(void)
 {
@@ -47,7 +47,7 @@ static cycle_t acpi_pm_read_verified(void)
        /*
         * It has been reported that because of various broken
         * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM clock
-        * source is not latched, so you must read it multiple
+        * source is not latched, you must read it multiple
         * times to ensure a safe value is read:
         */
        do {
@@ -171,7 +171,7 @@ static int __init init_acpi_pm_clocksource(void)
        return -ENODEV;
 
 pm_good:
-       return register_clocksource(&clocksource_acpi_pm);
+       return clocksource_register(&clocksource_acpi_pm);
 }
 
 module_init(init_acpi_pm_clocksource);