|
@@ -898,7 +898,6 @@ static void __slab_error(const char *function, struct kmem_cache *cachep,
|
|
*/
|
|
*/
|
|
|
|
|
|
static int use_alien_caches __read_mostly = 1;
|
|
static int use_alien_caches __read_mostly = 1;
|
|
-static int numa_platform __read_mostly = 1;
|
|
|
|
static int __init noaliencache_setup(char *s)
|
|
static int __init noaliencache_setup(char *s)
|
|
{
|
|
{
|
|
use_alien_caches = 0;
|
|
use_alien_caches = 0;
|
|
@@ -1457,10 +1456,8 @@ void __init kmem_cache_init(void)
|
|
int order;
|
|
int order;
|
|
int node;
|
|
int node;
|
|
|
|
|
|
- if (num_possible_nodes() == 1) {
|
|
|
|
|
|
+ if (num_possible_nodes() == 1)
|
|
use_alien_caches = 0;
|
|
use_alien_caches = 0;
|
|
- numa_platform = 0;
|
|
|
|
- }
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_INIT_LISTS; i++) {
|
|
for (i = 0; i < NUM_INIT_LISTS; i++) {
|
|
kmem_list3_init(&initkmem_list3[i]);
|
|
kmem_list3_init(&initkmem_list3[i]);
|
|
@@ -3590,7 +3587,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp)
|
|
* variable to skip the call, which is mostly likely to be present in
|
|
* variable to skip the call, which is mostly likely to be present in
|
|
* the cache.
|
|
* the cache.
|
|
*/
|
|
*/
|
|
- if (numa_platform && cache_free_alien(cachep, objp))
|
|
|
|
|
|
+ if (nr_online_nodes > 1 && cache_free_alien(cachep, objp))
|
|
return;
|
|
return;
|
|
|
|
|
|
if (likely(ac->avail < ac->limit)) {
|
|
if (likely(ac->avail < ac->limit)) {
|