diff --git a/[refs] b/[refs] index 766e31b5822f..b48333321253 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8759ec50a6cad7ca5a6d63e657d25b85ab5ba44a +refs/heads/master: dfcd3610289132a762b7dc0eaf33998262cd9e20 diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 000da12b5cf0..9d8ca14be3c4 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/include/linux/slab.h @@ -285,7 +285,7 @@ extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *); #define kmalloc_node_track_caller(size, flags, node) \ kmalloc_track_caller(size, flags) -#endif /* DEBUG_SLAB */ +#endif /* CONFIG_NUMA */ /* * Shortcuts