diff options
Diffstat (limited to 'mm/slab.c')
-rw-r--r-- | mm/slab.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -898,7 +898,6 @@ static void __slab_error(const char *function, struct kmem_cache *cachep, | |||
898 | */ | 898 | */ |
899 | 899 | ||
900 | static int use_alien_caches __read_mostly = 1; | 900 | static int use_alien_caches __read_mostly = 1; |
901 | static int numa_platform __read_mostly = 1; | ||
902 | static int __init noaliencache_setup(char *s) | 901 | static int __init noaliencache_setup(char *s) |
903 | { | 902 | { |
904 | use_alien_caches = 0; | 903 | use_alien_caches = 0; |
@@ -1457,10 +1456,8 @@ void __init kmem_cache_init(void) | |||
1457 | int order; | 1456 | int order; |
1458 | int node; | 1457 | int node; |
1459 | 1458 | ||
1460 | if (num_possible_nodes() == 1) { | 1459 | if (num_possible_nodes() == 1) |
1461 | use_alien_caches = 0; | 1460 | use_alien_caches = 0; |
1462 | numa_platform = 0; | ||
1463 | } | ||
1464 | 1461 | ||
1465 | for (i = 0; i < NUM_INIT_LISTS; i++) { | 1462 | for (i = 0; i < NUM_INIT_LISTS; i++) { |
1466 | kmem_list3_init(&initkmem_list3[i]); | 1463 | kmem_list3_init(&initkmem_list3[i]); |
@@ -3590,7 +3587,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp) | |||
3590 | * variable to skip the call, which is mostly likely to be present in | 3587 | * variable to skip the call, which is mostly likely to be present in |
3591 | * the cache. | 3588 | * the cache. |
3592 | */ | 3589 | */ |
3593 | if (numa_platform && cache_free_alien(cachep, objp)) | 3590 | if (nr_online_nodes > 1 && cache_free_alien(cachep, objp)) |
3594 | return; | 3591 | return; |
3595 | 3592 | ||
3596 | if (likely(ac->avail < ac->limit)) { | 3593 | if (likely(ac->avail < ac->limit)) { |