diff --git a/[refs] b/[refs] index fc67a207f4de..5e74be0e73b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90d8b7e6129e8f4e5b3bc1a2cfbe585372ce8646 +refs/heads/master: 8cde045c7ee97573be6ce495b8f7c918182a2c7a diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index b52b6ddd6c15..abe1e9f2a942 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -328,7 +328,7 @@ static int gather_surplus_pages(int delta) * allocated to satisfy the reservation must be explicitly freed if they were * never used. */ -void return_unused_surplus_pages(unsigned long unused_resv_pages) +static void return_unused_surplus_pages(unsigned long unused_resv_pages) { static int nid = -1; struct page *page;