From patchwork Fri Mar 25 16:55:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sorin Vinturis X-Patchwork-Id: 602053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3qWqdz4dQxz9s5w for ; Sat, 26 Mar 2016 04:13:59 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id E47FC10973; Fri, 25 Mar 2016 10:13:49 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id AEB1710931 for ; Fri, 25 Mar 2016 10:13:48 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 1F660161019 for ; Fri, 25 Mar 2016 11:13:48 -0600 (MDT) X-ASG-Debug-ID: 1458926026-0b323711c23c1d40001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar6.cudamail.com with ESMTP id S52BcRwISbRDoLJv (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 25 Mar 2016 11:13:46 -0600 (MDT) X-Barracuda-Envelope-From: svinturis@cloudbasesolutions.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO cbssmtp1.cloudbase.local) (91.232.152.5) by mx1-pf2.cudamail.com with SMTP; 25 Mar 2016 17:13:46 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at cloudbasesolutions.com designates 91.232.152.5 as permitted sender) X-Barracuda-Apparent-Source-IP: 91.232.152.5 X-Barracuda-RBL-IP: 91.232.152.5 Received: from localhost (localhost [127.0.0.1]) by cbssmtp1.cloudbase.local (Postfix) with ESMTP id 12F13417B2 for ; Fri, 25 Mar 2016 19:13:45 +0200 (EET) X-Virus-Scanned: amavisd-new at cloudbasesolutions.com Received: from cbssmtp1.cloudbase.local ([127.0.0.1]) by localhost (cbssmtp1.cloudbase.local [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3WVq8qYqJJrB for ; Fri, 25 Mar 2016 19:13:24 +0200 (EET) Received: from CBSEX1.cloudbase.local (unknown [10.77.78.3]) by cbssmtp1.cloudbase.local (Postfix) with ESMTP id 7D8414179E for ; Fri, 25 Mar 2016 18:55:25 +0200 (EET) Received: from CBSEX1.cloudbase.local ([10.77.78.3]) by CBSEX1.cloudbase.local ([10.77.78.3]) with mapi id 14.03.0224.002; Fri, 25 Mar 2016 17:55:25 +0100 X-CudaMail-Envelope-Sender: svinturis@cloudbasesolutions.com From: Sorin Vinturis To: "dev@openvswitch.org" X-CudaMail-MID: CM-E2-324070864 X-CudaMail-DTE: 032516 X-CudaMail-Originating-IP: 91.232.152.5 Thread-Topic: [PATCH v2] datapath-windows: Revert unrelated change to ovs-atomic.h X-ASG-Orig-Subj: [##CM-E2-324070864##][PATCH v2] datapath-windows: Revert unrelated change to ovs-atomic.h Thread-Index: AQHRhrcfan9+e1FgCU+HYtm+dTuvHA== Date: Fri, 25 Mar 2016 16:55:24 +0000 Message-ID: <1453968547-11424-1-git-send-email-svinturis@cloudbasesolutions.com> Accept-Language: en-US, it-IT Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.77.78.1] MIME-Version: 1.0 X-GBUdb-Analysis: 0, 91.232.152.5, Ugly c=0.363392 p=-0.647059 Source Normal X-MessageSniffer-Rules: 0-0-0-3730-c X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1458926026 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.10 X-Barracuda-Spam-Status: No, SCORE=0.10 using per-user scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.28159 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS Subject: [ovs-dev] [PATCH v2] datapath-windows: Revert unrelated change to ovs-atomic.h X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@openvswitch.org Sender: "dev" There was an unwanted change to ovs-atomic.h header made by the recirculation patch, ee25964a60c6b2c6e60a4c5fbfc9e90cf304f970 commit. This patch reverts that change. Signed-off-by: Sorin Vinturis Acked-by: Nithin Raju Acked-by: Alin Gabriel Serdean --- lib/ovs-atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h index 2046ea9..b38c9ef 100644 --- a/lib/ovs-atomic.h +++ b/lib/ovs-atomic.h @@ -333,7 +333,7 @@ #include "ovs-atomic-i586.h" #elif HAVE_GCC4_ATOMICS #include "ovs-atomic-gcc4+.h" - #elif _MSC_VER && _WIN32 + #elif _MSC_VER && _M_IX86 >= 500 #include "ovs-atomic-msvc.h" #else /* ovs-atomic-pthreads implementation is provided for portability.