diff --git a/[refs] b/[refs] index 24163c475170..f9cf6c7a05d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eada35efcb2773cf49aa26277e056122e1a3405c +refs/heads/master: dada123d99c241d1a45798a7c77bcf99c4968704 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 7870ef9d8636..1af7f2f19420 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -308,7 +308,7 @@ static inline int is_end(void *addr) return (unsigned long)addr & PAGE_MAPPING_ANON; } -void *slab_address(struct page *page) +static void *slab_address(struct page *page) { return page->end - PAGE_MAPPING_ANON; }