diff options
Diffstat (limited to 'mm/slob.c')
-rw-r--r-- | mm/slob.c | 28 |
1 files changed, 24 insertions, 4 deletions
@@ -462,11 +462,11 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller) | |||
462 | return ret; | 462 | return ret; |
463 | } | 463 | } |
464 | 464 | ||
465 | void *__kmalloc_node(size_t size, gfp_t gfp, int node) | 465 | void *__kmalloc(size_t size, gfp_t gfp) |
466 | { | 466 | { |
467 | return __do_kmalloc_node(size, gfp, node, _RET_IP_); | 467 | return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_); |
468 | } | 468 | } |
469 | EXPORT_SYMBOL(__kmalloc_node); | 469 | EXPORT_SYMBOL(__kmalloc); |
470 | 470 | ||
471 | #ifdef CONFIG_TRACING | 471 | #ifdef CONFIG_TRACING |
472 | void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller) | 472 | void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller) |
@@ -534,7 +534,7 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags) | |||
534 | return 0; | 534 | return 0; |
535 | } | 535 | } |
536 | 536 | ||
537 | void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node) | 537 | void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node) |
538 | { | 538 | { |
539 | void *b; | 539 | void *b; |
540 | 540 | ||
@@ -560,7 +560,27 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node) | |||
560 | kmemleak_alloc_recursive(b, c->size, 1, c->flags, flags); | 560 | kmemleak_alloc_recursive(b, c->size, 1, c->flags, flags); |
561 | return b; | 561 | return b; |
562 | } | 562 | } |
563 | EXPORT_SYMBOL(slob_alloc_node); | ||
564 | |||
565 | void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags) | ||
566 | { | ||
567 | return slob_alloc_node(cachep, flags, NUMA_NO_NODE); | ||
568 | } | ||
569 | EXPORT_SYMBOL(kmem_cache_alloc); | ||
570 | |||
571 | #ifdef CONFIG_NUMA | ||
572 | void *__kmalloc_node(size_t size, gfp_t gfp, int node) | ||
573 | { | ||
574 | return __do_kmalloc_node(size, gfp, node, _RET_IP_); | ||
575 | } | ||
576 | EXPORT_SYMBOL(__kmalloc_node); | ||
577 | |||
578 | void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node) | ||
579 | { | ||
580 | return slob_alloc_node(cachep, gfp, node); | ||
581 | } | ||
563 | EXPORT_SYMBOL(kmem_cache_alloc_node); | 582 | EXPORT_SYMBOL(kmem_cache_alloc_node); |
583 | #endif | ||
564 | 584 | ||
565 | static void __kmem_cache_free(void *b, int size) | 585 | static void __kmem_cache_free(void *b, int size) |
566 | { | 586 | { |