diff options
| author | Mel Gorman <mgorman@suse.de> | 2012-12-17 15:05:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 17:25:50 +0100 |
| commit | 221392c3ad0432e39fd74a349364f66cb0ed78f6 (patch) | |
| tree | cc47a75ade22ee1e32da36c67f3dea2bb9a42393 /kernel/sched/fair.c | |
| parent | mm: fix kernel BUG at huge_memory.c:1474! (diff) | |
| download | linux-221392c3ad0432e39fd74a349364f66cb0ed78f6.tar.xz linux-221392c3ad0432e39fd74a349364f66cb0ed78f6.zip | |
sched: numa: Fix build error if CONFIG_NUMA_BALANCING && !CONFIG_TRANSPARENT_HUGEPAGE
Michal Hocko reported that the following build error occurs if
CONFIG_NUMA_BALANCING is set without THP support
kernel/sched/fair.c: In function ‘task_numa_work’:
kernel/sched/fair.c:932:55: error: call to ‘__build_bug_failed’ declared with attribute error: BUILD_BUG failed
The problem is that HPAGE_PMD_SHIFT triggers a BUILD_BUG() on
!CONFIG_TRANSPARENT_HUGEPAGE. This patch addresses the problem.
Reported-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 9af5af979a13..4603d6cb9e25 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -929,7 +929,7 @@ void task_numa_work(struct callback_head *work) continue; /* Skip small VMAs. They are not likely to be of relevance */ - if (((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) < HPAGE_PMD_NR) + if (vma->vm_end - vma->vm_start < HPAGE_SIZE) continue; do { |