diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
| commit | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch) | |
| tree | 676e741f2552c9cb301e1e49c557b92bf8940f55 /drivers/cpufreq/loongson2_cpufreq.c | |
| parent | 3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff) | |
| parent | 042e1c79166b9250edd8262bea84e1703f27ad2e (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'drivers/cpufreq/loongson2_cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/loongson2_cpufreq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index d4add8621944..9fa177206032 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c +++ b/drivers/cpufreq/loongson2_cpufreq.c | |||
| @@ -148,9 +148,9 @@ static void loongson2_cpu_wait(void) | |||
| 148 | u32 cpu_freq; | 148 | u32 cpu_freq; |
| 149 | 149 | ||
| 150 | spin_lock_irqsave(&loongson2_wait_lock, flags); | 150 | spin_lock_irqsave(&loongson2_wait_lock, flags); |
| 151 | cpu_freq = LOONGSON_CHIPCFG0; | 151 | cpu_freq = LOONGSON_CHIPCFG(0); |
| 152 | LOONGSON_CHIPCFG0 &= ~0x7; /* Put CPU into wait mode */ | 152 | LOONGSON_CHIPCFG(0) &= ~0x7; /* Put CPU into wait mode */ |
| 153 | LOONGSON_CHIPCFG0 = cpu_freq; /* Restore CPU state */ | 153 | LOONGSON_CHIPCFG(0) = cpu_freq; /* Restore CPU state */ |
| 154 | spin_unlock_irqrestore(&loongson2_wait_lock, flags); | 154 | spin_unlock_irqrestore(&loongson2_wait_lock, flags); |
| 155 | local_irq_enable(); | 155 | local_irq_enable(); |
| 156 | } | 156 | } |