From cab59a2e88c5074c006325daf8c83c8c5068b2c7 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Fri, 18 May 2012 07:19:49 +0900 Subject: [PATCH] --- yaml --- r: 309547 b: refs/heads/master c: aba607d63c71ef9b185fc7cb9637ab70a2d88491 h: refs/heads/master i: 309545: 748ce24fedf9b8050694e23e1eac2341418e9b42 309543: 28754724efaeb47af4b1c85a123be2a0e291372e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c64xx/cpuidle.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e6b791806f76..d361a0e78aa3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c8b20752893d58bc7b6489c0610951076b0fce8 +refs/heads/master: aba607d63c71ef9b185fc7cb9637ab70a2d88491 diff --git a/trunk/arch/arm/mach-s3c64xx/cpuidle.c b/trunk/arch/arm/mach-s3c64xx/cpuidle.c index 2750e5412cee..acb197ccf3f7 100644 --- a/trunk/arch/arm/mach-s3c64xx/cpuidle.c +++ b/trunk/arch/arm/mach-s3c64xx/cpuidle.c @@ -27,12 +27,7 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct timeval before, after; unsigned long tmp; - int idle_time; - - local_irq_disable(); - do_gettimeofday(&before); /* Setup PWRCFG to enter idle mode */ tmp = __raw_readl(S3C64XX_PWR_CFG); @@ -42,12 +37,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, cpu_do_idle(); - do_gettimeofday(&after); - local_irq_enable(); - idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + - (after.tv_usec - before.tv_usec); - - dev->last_residency = idle_time; return index; } @@ -56,6 +45,7 @@ static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device); static struct cpuidle_driver s3c64xx_cpuidle_driver = { .name = "s3c64xx_cpuidle", .owner = THIS_MODULE, + .en_core_tk_irqen = 1, .states = { { .enter = s3c64xx_enter_idle,