Disables using alien cache for slab when NUMA emulation is being used.
Cc: Andi Kleen <[email protected]>
Signed-off-by: Paul Menage <[email protected]>
Signed-off-by: David Rientjes <[email protected]>
---
arch/x86_64/mm/numa.c | 2 ++
mm/slab.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 97b7be4..7edb1b8 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -280,6 +280,7 @@ void __init numa_init_array(void)
PAGE_SHIFT)
static struct bootnode physical_node_map[MAX_NUMNODES];
+extern int use_alien_caches;
char *cmdline __initdata;
int numa_emu;
@@ -512,6 +513,7 @@ out:
nodes[i].end >> PAGE_SHIFT);
setup_node_bootmem(i, nodes[i].start, nodes[i].end);
}
+ use_alien_caches = 0;
numa_init_array();
return 0;
}
diff --git a/mm/slab.c b/mm/slab.c
index 22bad53..0e68246 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -889,7 +889,7 @@ static void __slab_error(const char *function, struct kmem_cache *cachep,
* line
*/
-static int use_alien_caches __read_mostly = 1;
+int use_alien_caches __read_mostly = 1;
static int __init noaliencache_setup(char *s)
{
use_alien_caches = 0;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
