---

yaml --- r: 224543 b: refs/heads/master c: b02038a h: refs/heads/master i: 224541: 6343a9a 224539: 5262e01 224535: b0f857d 224527: 0361065 224511: 44fef57 v: v3
git-mirror · Nov 29, 2010 · b7ead28 · b7ead28
1 parent 80a38cf
commit b7ead28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;