diff --git a/[refs] b/[refs] index 6719fefcf0a3..a9ddd8864ae5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c748e1340e0de3fa7fed86f8bdf499be9242afff +refs/heads/master: 75353bed36cfbbfb55bbde0896bbf5a02d9ba355 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index ab171274ef21..2c5c9ee4220d 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -603,7 +603,6 @@ static unsigned long set_max_huge_pages(unsigned long count) } while (count > persistent_huge_pages) { - int ret; /* * If this allocation races such that we no longer need the * page, free_huge_page will handle it by freeing the page