diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
commit | 450cdfa9c5713551ab1438ab210679868b52a994 (patch) | |
tree | edd98f9698aa88af55a3a1ee3de62e52917c39ba /kernel/sched/fair.c | |
parent | bf78886fb6c4131885f84f3eaaf7474509d40e51 (diff) | |
parent | 8b4ed85b8404ffe7e10ee410c4df3968b86f0793 (diff) |
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/smp.c
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'kernel/sched/fair.c')
-rw-r--r-- | kernel/sched/fair.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 1ae8de26e9b..07bb1feaeed 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -945,6 +945,13 @@ void task_numa_work(struct callback_head *work) if (vma->vm_end - vma->vm_start < HPAGE_SIZE) continue; + /* + * Skip inaccessible VMAs to avoid any confusion between + * PROT_NONE and NUMA hinting ptes + */ + if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))) + continue; + do { start = max(start, vma->vm_start); end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE); |