From 221392c3ad0432e39fd74a349364f66cb0ed78f6 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Mon, 17 Dec 2012 14:05:53 +0000 Subject: sched: numa: Fix build error if CONFIG_NUMA_BALANCING && !CONFIG_TRANSPARENT_HUGEPAGE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Mel Gorman Signed-off-by: Linus Torvalds --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel') 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 { -- cgit v1.2.3