From patchwork Tue Dec 14 13:09:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 75488 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 260F81007D1 for ; Wed, 15 Dec 2010 00:09:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756645Ab0LNNJl (ORCPT ); Tue, 14 Dec 2010 08:09:41 -0500 Received: from mail-pv0-f174.google.com ([74.125.83.174]:57761 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755305Ab0LNNJl (ORCPT ); Tue, 14 Dec 2010 08:09:41 -0500 Received: by pva4 with SMTP id 4so94359pva.19 for ; Tue, 14 Dec 2010 05:09:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=V1gKvcue2pEyEK7HZZ4u3Lizkm69us3YIBtlfBiaCXk=; b=Ih05bqlxfJ8RS/igMdDOWnZY3JH4pMtMg2Ub4wQBoCH9wNoNLAKVw8HSXR/GtOTaX/ /CVMsPXTn+e+QQ22RlfUMb6jA8zeeO6IgBJ8/VwJEkDdbzJadztJhwQQrkATAIU0qnl7 xZmt2HK8RSRDrx7AYHzKU4o6u35EvJlBjfdOc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=wQdSG0Hq7jkv20zGD1+7qvNr594HqtxufhedhLDsvb3AP7bzy1ORK4iOnFQm5wNSR3 vKkAkM3BDnX+7A2nXhpdb9mVfsuoMI2fmmDIuQmdSkyzELWYOvPXaxDuOa4aWjsymj9t iJAp9VjGTXSU3PbyRRAO8LhUoY3tM91dJmQe0= Received: by 10.142.191.20 with SMTP id o20mr4331609wff.49.1292332180583; Tue, 14 Dec 2010 05:09:40 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id b11sm70082wff.21.2010.12.14.05.09.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Dec 2010 05:09:39 -0800 (PST) From: Changli Gao To: "David S. Miller" Cc: Eric Dumazet , Tom Herbert , netdev@vger.kernel.org, Changli Gao Subject: [PATCH] net: use NUMA_NO_NODE instead of the magic number -1 Date: Tue, 14 Dec 2010 21:09:15 +0800 Message-Id: <1292332155-25151-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Changli Gao --- include/linux/netdevice.h | 2 +- net/core/dev.c | 2 +- net/core/net-sysfs.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d31bc3c..56c38bb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -530,7 +530,7 @@ static inline int netdev_queue_numa_node_read(const struct netdev_queue *q) #if defined(CONFIG_XPS) && defined(CONFIG_NUMA) return q->numa_node; #else - return -1; + return NUMA_NO_NODE; #endif } diff --git a/net/core/dev.c b/net/core/dev.c index d28b3a0..004024c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5116,7 +5116,7 @@ static void netdev_init_one_queue(struct net_device *dev, spin_lock_init(&queue->_xmit_lock); netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type); queue->xmit_lock_owner = -1; - netdev_queue_numa_node_write(queue, -1); + netdev_queue_numa_node_write(queue, NUMA_NO_NODE); queue->dev = dev; } diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 85e8b53..e23c01b 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1009,7 +1009,8 @@ static ssize_t store_xps_map(struct netdev_queue *queue, if (dev_maps) call_rcu(&dev_maps->rcu, xps_dev_maps_release); - netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node : -1); + netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node : + NUMA_NO_NODE); mutex_unlock(&xps_map_mutex);