diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 13:15:11 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 13:15:11 +0100 |
| commit | af90aa3080dd6af491f0131165a58beedb9e6217 (patch) | |
| tree | d4a76180397fd7c2dd3c6ef6060bdc55be37cbe1 /kernel/time/tick-sched.c | |
| parent | 4fb23ca1a553ad49a02e0fffc0474f615a72660e (diff) | |
| parent | be3d845ee40c30b52b56a7fb44013674ccab03fd (diff) | |
| download | kernel_samsung_smdk4412-replicant-6.0-old.zip kernel_samsung_smdk4412-replicant-6.0-old.tar.gz kernel_samsung_smdk4412-replicant-6.0-old.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into replicant-6.0replicant-6.0-alpha-0002replicant-6.0-old
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
usr/galaxys2_initramfs_files/init
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index c0be5f2..c473ce2 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -811,7 +811,7 @@ void tick_cancel_sched_timer(int cpu) hrtimer_cancel(&ts->sched_timer); # endif - memset(ts, 0, sizeof(*ts)); + ts->nohz_mode = NOHZ_MODE_INACTIVE; } #endif |