From effa4c326af5389ff05540ffea56d118358f7c13 Mon Sep 17 00:00:00 2001 From: Joseph Lo Date: Mon, 7 Jan 2013 10:56:14 +0800 Subject: [PATCH] --- yaml --- r: 355294 b: refs/heads/master c: 1395868c06bd41390e50e7c7fe9a4783dd620867 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/platsmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d947f7499a69..7020f36f562d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e32366fe51fea464adb21c244f372d55207e13c +refs/heads/master: 1395868c06bd41390e50e7c7fe9a4783dd620867 diff --git a/trunk/arch/arm/mach-tegra/platsmp.c b/trunk/arch/arm/mach-tegra/platsmp.c index 60daf9f945cb..68670304d9bc 100644 --- a/trunk/arch/arm/mach-tegra/platsmp.c +++ b/trunk/arch/arm/mach-tegra/platsmp.c @@ -90,7 +90,7 @@ static int tegra30_power_up_cpu(unsigned int cpu) * next time around. */ if (cpumask_test_cpu(cpu, &tegra_cpu_init_mask)) { - timeout = jiffies + 5*HZ; + timeout = jiffies + msecs_to_jiffies(50); do { if (!tegra_powergate_is_powered(pwrgateid)) goto remove_clamps; @@ -110,7 +110,7 @@ static int tegra30_power_up_cpu(unsigned int cpu) return ret; /* Wait for the power to come up. */ - timeout = jiffies + 10*HZ; + timeout = jiffies + msecs_to_jiffies(100); while (tegra_powergate_is_powered(pwrgateid)) { if (time_after(jiffies, timeout)) return -ETIMEDOUT;