mm/slab: move kfree() from slab_common.c to slub.c

[sfrench/cifs-2.6.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index bbc2e3f061f1363c114f381f96dea0ba62803773..f4f275613d2a783f0835cf5c41c20b4cdfe6586f 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -963,22 +963,6 @@ void __init create_kmalloc_caches(slab_flags_t flags)
        slab_state = UP;
 }
 
-void free_large_kmalloc(struct folio *folio, void *object)
-{
-       unsigned int order = folio_order(folio);
-
-       if (WARN_ON_ONCE(order == 0))
-               pr_warn_once("object pointer: 0x%p\n", object);
-
-       kmemleak_free(object);
-       kasan_kfree_large(object);
-       kmsan_kfree_large(object);
-
-       mod_lruvec_page_state(folio_page(folio, 0), NR_SLAB_UNRECLAIMABLE_B,
-                             -(PAGE_SIZE << order));
-       __free_pages(folio_page(folio, 0), order);
-}
-
 static void *__kmalloc_large_node(size_t size, gfp_t flags, int node);
 static __always_inline
 void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
@@ -1023,35 +1007,6 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t flags,
 }
 EXPORT_SYMBOL(__kmalloc_node_track_caller);
 
-/**
- * kfree - free previously allocated memory
- * @object: pointer returned by kmalloc() or kmem_cache_alloc()
- *
- * If @object is NULL, no operation is performed.
- */
-void kfree(const void *object)
-{
-       struct folio *folio;
-       struct slab *slab;
-       struct kmem_cache *s;
-
-       trace_kfree(_RET_IP_, object);
-
-       if (unlikely(ZERO_OR_NULL_PTR(object)))
-               return;
-
-       folio = virt_to_folio(object);
-       if (unlikely(!folio_test_slab(folio))) {
-               free_large_kmalloc(folio, (void *)object);
-               return;
-       }
-
-       slab = folio_slab(folio);
-       s = slab->slab_cache;
-       __kmem_cache_free(s, (void *)object, _RET_IP_);
-}
-EXPORT_SYMBOL(kfree);
-
 /**
  * __ksize -- Report full size of underlying allocation
  * @object: pointer to the object