diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
| commit | a600ffe6ec609b0600ec590236f97f8d430e0984 (patch) | |
| tree | 57432877c74c80ab470d7b655a2e18a6b5168ee5 /kernel/sched/debug.c | |
| parent | Merge branch 'for-4.20/cougar' into for-linus (diff) | |
| parent | HID: google: add dependency on Cros EC for Hammer (diff) | |
| download | linux-a600ffe6ec609b0600ec590236f97f8d430e0984.tar.gz linux-a600ffe6ec609b0600ec590236f97f8d430e0984.zip | |
Merge branch 'for-4.20/google' into for-linus
Whisker device specific fixes to hid-google driver
Diffstat (limited to 'kernel/sched/debug.c')
| -rw-r--r-- | kernel/sched/debug.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 60caf1fb94e0..6383aa6a60ca 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -89,12 +89,12 @@ struct static_key sched_feat_keys[__SCHED_FEAT_NR] = { static void sched_feat_disable(int i) { - static_key_disable(&sched_feat_keys[i]); + static_key_disable_cpuslocked(&sched_feat_keys[i]); } static void sched_feat_enable(int i) { - static_key_enable(&sched_feat_keys[i]); + static_key_enable_cpuslocked(&sched_feat_keys[i]); } #else static void sched_feat_disable(int i) { }; @@ -146,9 +146,11 @@ sched_feat_write(struct file *filp, const char __user *ubuf, /* Ensure the static_key remains in a consistent state */ inode = file_inode(filp); + cpus_read_lock(); inode_lock(inode); ret = sched_feat_set(cmp); inode_unlock(inode); + cpus_read_unlock(); if (ret < 0) return ret; |