From a556ff5f0101ebd61c10e92df5b6a0c76f989f0b Mon Sep 17 00:00:00 2001 From: "Chen, Kenneth W" Date: Fri, 3 Feb 2006 21:51:14 +0100 Subject: [PATCH] --- yaml --- r: 19772 b: refs/heads/master c: 00ac59adfca8f2f339beb0b67054e786c275553e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mempolicy.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 263e8adc4770..d8531e590132 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e8c34edfd7ae97d0e3391f34d9d26a0167912bf +refs/heads/master: 00ac59adfca8f2f339beb0b67054e786c275553e diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 27da6d5c77ba..3bd7fb7e4b75 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -1159,6 +1159,7 @@ static inline unsigned interleave_nid(struct mempolicy *pol, return interleave_nodes(pol); } +#ifdef CONFIG_HUGETLBFS /* Return a zonelist suitable for a huge page allocation. */ struct zonelist *huge_zonelist(struct vm_area_struct *vma, unsigned long addr) { @@ -1172,6 +1173,7 @@ struct zonelist *huge_zonelist(struct vm_area_struct *vma, unsigned long addr) } return zonelist_policy(GFP_HIGHUSER, pol); } +#endif /* Allocate a page in interleaved policy. Own path because it needs to do special accounting. */