Merge branch 'topic/core-change' into for-linus

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index e7fee0f198d5..9cedcef11575 100644
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
@@ -75,7 +75,7 @@ u32 arch_gettimeoffset(void)
                 count = 0;
 
         count = (latch - count) * TICK_SIZE;
-        elapsed_time = (count + latch / 2) / latch;
+        elapsed_time = DIV_ROUND_CLOSEST(count, latch);
         /* NOTE: LATCH is equal to the "interval" value (= reload count). */
 
 #else /* CONFIG_SMP */
@@ -93,7 +93,7 @@ u32 arch_gettimeoffset(void)
         p_count = count;
 
         count = (latch - count) * TICK_SIZE;
-        elapsed_time = (count + latch / 2) / latch;
+        elapsed_time = DIV_ROUND_CLOSEST(count, latch);
         /* NOTE: LATCH is equal to the "interval" value (= reload count). */
 #endif /* CONFIG_SMP */
 #elif defined(CONFIG_CHIP_M32310)
@@ -211,7 +211,7 @@ void __init time_init(void)
 
                 bus_clock = boot_cpu_data.bus_clock;
                 divide = boot_cpu_data.timer_divide;
-                latch = (bus_clock/divide + HZ / 2) / HZ;
+                latch = DIV_ROUND_CLOSEST(bus_clock/divide, HZ);
 
                 printk("Timer start : latch = %ld\n", latch);