From b7ead281d04e72e206b7069e7ae219f1e9759572 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 28 Nov 2010 05:43:24 +0000
Subject: [PATCH] --- yaml --- r: 224543 b: refs/heads/master c:
 b02038a17b271e0f70616c54e4eccb5cc33d1b74 h: refs/heads/master i:   224541:
 6343a9a2e53ea9847c1ceeb76b6ce0e8559eb2b5   224539:
 5262e016dc1fac1332037e2f0e377325ec441846   224535:
 b0f857ddae6b879aacee19de6c309793b28fc6ab   224527:
 0361065605f804cedc1691b78cc2e2c13cb44fee   224511:
 44fef5721327109c3f69416d59815987af9428d6 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/net-sysfs.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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;