From patchwork Tue May 2 09:59:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriele Paoloni X-Patchwork-Id: 98428 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1791311qgf; Tue, 2 May 2017 03:02:37 -0700 (PDT) X-Received: by 10.84.229.15 with SMTP id b15mr3779379plk.14.1493719357525; Tue, 02 May 2017 03:02:37 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t73si17178428pfa.66.2017.05.02.03.02.37; Tue, 02 May 2017 03:02:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751287AbdEBKCf (ORCPT + 6 others); Tue, 2 May 2017 06:02:35 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:5845 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750955AbdEBKCe (ORCPT ); Tue, 2 May 2017 06:02:34 -0400 Received: from 172.30.72.55 (EHLO DGGEML401-HUB.china.huawei.com) ([172.30.72.55]) by dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AMU50685; Tue, 02 May 2017 18:01:33 +0800 (CST) Received: from G00308965-DELL1.china.huawei.com (10.203.181.153) by DGGEML401-HUB.china.huawei.com (10.3.17.32) with Microsoft SMTP Server id 14.3.301.0; Tue, 2 May 2017 17:59:57 +0800 From: Gabriele Paoloni To: , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH 1/2] net: revert commit 1a8b6d76dc5b Date: Tue, 2 May 2017 10:59:25 +0100 Message-ID: <1493719166-9036-2-git-send-email-gabriele.paoloni@huawei.com> X-Mailer: git-send-email 2.7.1.windows.1 In-Reply-To: <1493719166-9036-1-git-send-email-gabriele.paoloni@huawei.com> References: <1493719166-9036-1-git-send-email-gabriele.paoloni@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.203.181.153] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.590858FF.019D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 0db64d227e2ae787f7398e90c84a4f98 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: gabriele paoloni commit 1a8b6d76dc5b was introducing relaxed ordering as global symbol. This does not make sense as relaxed ordering support depends on the PCIe EP and on the Root Complex (therefore it is not related to the CPU architecture) Signed-off-by: Gabriele Paoloni --- arch/Kconfig | 3 --- arch/sparc/Kconfig | 1 - drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) -- 2.7.4 diff --git a/arch/Kconfig b/arch/Kconfig index c4d6833..c0b118d 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -851,7 +851,4 @@ config STRICT_MODULE_RWX and non-text memory will be made non-executable. This provides protection against certain security exploits (e.g. writing to text) -config ARCH_WANT_RELAX_ORDER - bool - source "kernel/gcov/Kconfig" diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index ed96869..3f47142 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -43,7 +43,6 @@ config SPARC select ARCH_HAS_SG_CHAIN select CPU_NO_EFFICIENT_FFS select LOCKDEP_SMALL if LOCKDEP - select ARCH_WANT_RELAX_ORDER config SPARC32 def_bool !64BIT diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index c38d50c..094e1d6 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c @@ -350,7 +350,7 @@ s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw) } IXGBE_WRITE_FLUSH(hw); -#ifndef CONFIG_ARCH_WANT_RELAX_ORDER +#ifndef CONFIG_SPARC /* Disable relaxed ordering */ for (i = 0; i < hw->mac.max_tx_queues; i++) { u32 regval;