diff --git a/[refs] b/[refs] index ddbd42a49e0f..e5805e6756dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0931ef1f3e7305e55de1591602e5f25e4c11d1d +refs/heads/master: 5b74beb425e0eb009d16d4b9a0f55847a5f342fa diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index cb6ce2dfc7cf..3b4587bb7b19 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -515,12 +515,6 @@ EXPORT_SYMBOL(slab_buffer_size); static int slab_max_order = SLAB_MAX_ORDER_LO; static bool slab_max_order_set __initdata; -static inline struct kmem_cache *page_get_cache(struct page *page) -{ - BUG_ON(!PageSlab(page)); - return page->slab_cache; -} - static inline struct kmem_cache *virt_to_cache(const void *obj) { struct page *page = virt_to_head_page(obj);