On Thu, Nov 14, 2013 at 03:11:21PM -0800, David Rientjes wrote: > On Thu, 14 Nov 2013, Naoya Horiguchi wrote: > > > Introduces a cosmetic substitution of the returned value of > > isolate_huge_page() > > to suppress a build warning when !CONFIG_HUGETLBFS. No behavioral change. > > > > Reported-by: Borislav Petkov <[email protected]> > > Tested-by: Borislav Petkov <[email protected]> > > Signed-off-by: Naoya Horiguchi <[email protected]> > > --- > > mm/migrate.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/mm/migrate.c b/mm/migrate.c > > index 4cd63c2..4a26042 100644 > > --- a/mm/migrate.c > > +++ b/mm/migrate.c > > @@ -1168,7 +1168,7 @@ static int do_move_page_to_node_array(struct > > mm_struct *mm, > > goto put_and_set; > > > > if (PageHuge(page)) { > > - isolate_huge_page(page, &pagelist); > > + err = isolate_huge_page(page, &pagelist); > > goto put_and_set; > > } > > > > I think it would be better to just fix hugetlb.h to do > > static inline bool isolate_huge_page(struct page *page, struct > list_head *list) > { > return false; > } > > for the !CONFIG_HUGETLB_PAGE variant.
Right. I confirmed that it fixes the warning with Borislav's .config. Here is new one. Could you add some credit tag? Thanks, Naoya --- From: Naoya Horiguchi <[email protected]> Date: Fri, 15 Nov 2013 09:00:15 -0500 Subject: [PATCH] mm/migrate.c: take returned value of isolate_huge_page() Introduces a cosmetic substitution of the returned value of isolate_huge_page() to suppress a build warning when !CONFIG_HUGETLBFS. No behavioral change. Reported-by: Borislav Petkov <[email protected]> Tested-by: Borislav Petkov <[email protected]> Signed-off-by: Naoya Horiguchi <[email protected]> --- include/linux/hugetlb.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index acd2010328f3..25cdb9b285a9 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -137,7 +137,10 @@ static inline int dequeue_hwpoisoned_huge_page(struct page *page) return 0; } -#define isolate_huge_page(p, l) false +static inline bool isolate_huge_page(struct page *page, struct list_head *list) +{ + return false; +} #define putback_active_hugepage(p) do {} while (0) #define is_hugepage_active(x) false static inline void copy_huge_page(struct page *dst, struct page *src) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
