diff --git a/[refs] b/[refs] index 1598eb2f47a3..d5f9ac8a6162 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49b4a6546fac02f58784f0744e0f99a6562ccc03 +refs/heads/master: b02038a17b271e0f70616c54e4eccb5cc33d1b74 diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c index 99c11294623f..35ef42fa0cf3 100644 --- a/trunk/net/core/net-sysfs.c +++ b/trunk/net/core/net-sysfs.c @@ -956,8 +956,9 @@ static ssize_t store_xps_map(struct netdev_queue *queue, if (map_len >= alloc_len) { alloc_len = alloc_len ? 2 * alloc_len : XPS_MIN_MAP_ALLOC; - new_map = kzalloc(XPS_MAP_SIZE(alloc_len), - GFP_KERNEL); + new_map = kzalloc_node(XPS_MAP_SIZE(alloc_len), + GFP_KERNEL, + cpu_to_node(cpu)); if (!new_map) goto error; new_map->alloc_len = alloc_len;