diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-07-07 10:36:36 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-07 10:36:36 +0800 |
| commit | 0f09c683deb6c649591ff38587535690078809af (patch) | |
| tree | c33d5a34ad48e067bbf39234515f01d11817adfe /kernel/watchdog.c | |
| parent | bab66e96641aeadf263ec443dbcc57090a664dea (diff) | |
| parent | 65c0e55c16d87ab094ae512d1dc1c481be27bf21 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'kernel/watchdog.c')
| -rw-r--r-- | kernel/watchdog.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 68fbd3f169f1..a404c05c0fea 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -637,10 +637,8 @@ static void update_timers_all_cpus(void) int cpu; get_online_cpus(); - preempt_disable(); for_each_online_cpu(cpu) update_timers(cpu); - preempt_enable(); put_online_cpus(); } |