From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932824AbaGWCgk (ORCPT ); Tue, 22 Jul 2014 22:36:40 -0400 Received: from mga01.intel.com ([192.55.52.88]:34603 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932623AbaGWCgi (ORCPT ); Tue, 22 Jul 2014 22:36:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="363778753" From: "Chen, Gong" To: linux-kernel@vger.kernel.org Cc: mingo@kernel.org, tglx@linutronix.de, paulus@samba.org, benh@kernel.crashing.org, tony.luck@intel.com, hpa@zytor.com, jkosina@suse.cz, rafael.j.wysocki@intel.com, bp@alien8.de, linux@arm.linux.org.uk, ralf@linux-mips.org, schwidefsky@de.ibm.com, davem@davemloft.net, viro@zeniv.linux.org.uk, fweisbec@gmail.com, cl@linux.com, akpm@linux-foundation.org, axboe@kernel.dk, JBottomley@parallels.com, neilb@suse.de, christoffer.dall@linaro.org, rostedt@goodmis.org, rric@kernel.org, gregkh@linuxfoundation.org, mhocko@suse.cz, david@fromorbit.com, "Chen, Gong" Subject: [RFC PATCH v1 45/70] net, core, dev: _FROZEN Cleanup Date: Tue, 22 Jul 2014 21:59:21 -0400 Message-Id: <1406080786-3938-46-git-send-email-gong.chen@linux.intel.com> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1406080786-3938-1-git-send-email-gong.chen@linux.intel.com> References: <1406080786-3938-1-git-send-email-gong.chen@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove XXX_FROZEN state from net/core/dev. Signed-off-by: Chen, Gong --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index 7990984..2c3801a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6805,7 +6805,7 @@ static int dev_cpu_callback(struct notifier_block *nfb, unsigned int cpu, oldcpu = (unsigned long)ocpu; struct softnet_data *sd, *oldsd; - if (action != CPU_DEAD && action != CPU_DEAD_FROZEN) + if ((action & ~CPU_TASKS_FROZEN) != CPU_DEAD) return NOTIFY_OK; local_irq_disable(); -- 2.0.0.rc2