Commit 221392c3 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds

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: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a4f1de17
...@@ -929,7 +929,7 @@ void task_numa_work(struct callback_head *work) ...@@ -929,7 +929,7 @@ void task_numa_work(struct callback_head *work)
continue; continue;
/* Skip small VMAs. They are not likely to be of relevance */ /* 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; continue;
do { do {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment