From 587c7faff13cff2fe0d619df7eef5c94032f1763 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Thu, 10 May 2012 00:37:48 +0200 Subject: [PATCH] --- yaml --- r: 303259 b: refs/heads/master c: 173bf69a7af142e0325fa514954f6eeb2d20cc1d h: refs/heads/master i: 303257: bb84c03defab4a95388f04c377bb6cab1e3f2a2f 303255: 05e9f0d478047c73f208974ff82f9034ff380eaf v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/timer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c56e43fe175c..aa66143ca926 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15d2c83948a3f47095017dbcf2060132bcd8c00c +refs/heads/master: 173bf69a7af142e0325fa514954f6eeb2d20cc1d diff --git a/trunk/arch/arm/mach-shmobile/timer.c b/trunk/arch/arm/mach-shmobile/timer.c index cba39d866687..a68919727e24 100644 --- a/trunk/arch/arm/mach-shmobile/timer.c +++ b/trunk/arch/arm/mach-shmobile/timer.c @@ -36,7 +36,8 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, unsigned int value = (1000000 * mult) / (HZ * div); - lpj_fine = max_cpu_core_mhz * value; + if (!preset_lpj) + preset_lpj = max_cpu_core_mhz * value; } static void __init shmobile_late_time_init(void)