diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 12:47:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 12:47:15 -0400 |
| commit | 0b3e9f3f21c42d064f5f4088df4088e3d55755eb (patch) | |
| tree | b153a9346bf21a64a9e5c5f3f440f00b591fd269 /arch/blackfin | |
| parent | 99becf1328d8d71dd6f4480e3591d7dcdb389e57 (diff) | |
| parent | 6a4c96eef42f835734a82c6b512abf9881b7c55d (diff) | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar.
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched: Remove NULL assignment of dattr_cur
sched: Remove the last NULL entry from sched_feat_names
sched: Make sched_feat_names const
sched/rt: Fix SCHED_RR across cgroups
sched: Move nr_cpus_allowed out of 'struct sched_rt_entity'
sched: Make sure to not re-read variables after validation
sched: Fix SD_OVERLAP
sched: Don't try allocating memory from offline nodes
sched/nohz: Fix rq->cpu_load calculations some more
sched/x86: Use cpu_llc_shared_mask(cpu) for coregroup_mask
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c index 2e3994b20169..62bcea7dcc6d 100644 --- a/arch/blackfin/kernel/process.c +++ b/arch/blackfin/kernel/process.c | |||
| @@ -173,7 +173,7 @@ asmlinkage int bfin_clone(struct pt_regs *regs) | |||
| 173 | unsigned long newsp; | 173 | unsigned long newsp; |
| 174 | 174 | ||
| 175 | #ifdef __ARCH_SYNC_CORE_DCACHE | 175 | #ifdef __ARCH_SYNC_CORE_DCACHE |
| 176 | if (current->rt.nr_cpus_allowed == num_possible_cpus()) | 176 | if (current->nr_cpus_allowed == num_possible_cpus()) |
| 177 | set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id())); | 177 | set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id())); |
| 178 | #endif | 178 | #endif |
| 179 | 179 | ||