diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-09-02 10:18:15 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-09-02 10:18:15 +0000 |
commit | 7d6cff4882e1484e09956e19825acdae3a68618c (patch) | |
tree | 76a46ad583bca975dd2cb71f20543fa2c1eee425 /target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch | |
parent | 7747092ed1d906b247d834735941d995a62c5556 (diff) | |
download | upstream-7d6cff4882e1484e09956e19825acdae3a68618c.tar.gz upstream-7d6cff4882e1484e09956e19825acdae3a68618c.tar.bz2 upstream-7d6cff4882e1484e09956e19825acdae3a68618c.zip |
kernel: update 3.18 to 3.18.21
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.21
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46768
Diffstat (limited to 'target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch b/target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch deleted file mode 100644 index a7bfef347c..0000000000 --- a/target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Date: Sun, 19 Jul 2015 00:21:57 +0200 -Subject: [PATCH] MIPS: kernel: fix sched_getaffinity with MT FPAFF enabled - -p->thread.user_cpus_allowed is zero-initialized and is only filled on -the first sched_setaffinity call. - -To avoid adding overhead in the task initialization codepath, simply OR -the returned mask in sched_getaffinity with p->cpus_allowed. - -Cc: stable@vger.kernel.org -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- - ---- a/arch/mips/kernel/mips-mt-fpaff.c -+++ b/arch/mips/kernel/mips-mt-fpaff.c -@@ -154,7 +154,7 @@ asmlinkage long mipsmt_sys_sched_getaffi - unsigned long __user *user_mask_ptr) - { - unsigned int real_len; -- cpumask_t mask; -+ cpumask_t allowed, mask; - int retval; - struct task_struct *p; - -@@ -173,7 +173,8 @@ asmlinkage long mipsmt_sys_sched_getaffi - if (retval) - goto out_unlock; - -- cpumask_and(&mask, &p->thread.user_cpus_allowed, cpu_possible_mask); -+ cpumask_or(&allowed, &p->thread.user_cpus_allowed, &p->cpus_allowed); -+ cpumask_and(&mask, &allowed, cpu_active_mask); - - out_unlock: - read_unlock(&tasklist_lock); |