From owner-svn-src-head@freebsd.org Wed May 18 16:41:53 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC2EBB41C5C; Wed, 18 May 2016 16:41:53 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A3FE71FD5; Wed, 18 May 2016 16:41:53 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-io0-x22e.google.com with SMTP id 190so72553445iow.1; Wed, 18 May 2016 09:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dSDj0jsrZA3aMJNNorC0vUtlAP6QTM1cuzVq71Jmys4=; b=yZDmmC2v8B0HLrDqrAYl3VkGKyOGu1//FxaSUd0yo/IBahbqVR87yoBrXNkclkU4xy LBgraT0aRAN84RNjRn+sQlL7id7tQ+PNSdeP3pDyuQUNjvo7LLoRoPG8ISAscFHbQbnM Le2eAcVYpDVIXVph2S9UfXAPdcXx5Az2PepmMQfKkH9QikRP/LNG1kqSpGg9qCTSn3rG 7cFMiJInku+4x5L0Xh90I2l4actXWV+86f9NUfIbvWpwC39ZWS15H8Jg//2v2dzV9alx csAk7pSG13BV4sA+RsbNmvjMjwLovsQxk1XQ31B2zmFQsjliqeV3vTRp8xes7v7+SHfO Y5gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dSDj0jsrZA3aMJNNorC0vUtlAP6QTM1cuzVq71Jmys4=; b=kLs1eIc9A75+mR3zIO1TiC7b7Ab6AJxAoq3JE4rsF4qQ9OY6BzZxPwFTkbX/fZQ3HX OxRXD+9NPkswjXBP3Ioo9Xban+YWPi+lGIDe8Ywt+EYwiFaoEwgvDN7s9CEHaZxBcxxb pAfJaloKK8OAgkiQfO5BtMdOK3nAU5Ox/8+NRabP1cXFJOrkatar6s+6ER6YXDq2HMlE SzAtLbl1fM8kilzuDL5ogzkltNlyCHoD3DPlolOcWqeK69RLVtXI4ExUppOf13khF/ge yH67OUP6LeOMUvwbeEuBmlpretCv2KLqCtxf7fN/P9F4gQd2l99+zOF6D/OsYTof4E/7 Pw/A== X-Gm-Message-State: AOPr4FWxo1zxXYC38cn7zzGO9BRtYytuqAr8FIxDl3rPd4A1UP43alsQ9AoiQJwhxlnMzQ== X-Received: by 10.107.11.71 with SMTP id v68mr6411787ioi.184.1463589713107; Wed, 18 May 2016 09:41:53 -0700 (PDT) Received: from zhabar.knownspace (173-29-11-18.client.mchsi.com. [173.29.11.18]) by smtp.gmail.com with ESMTPSA id e66sm2983860iof.18.2016.05.18.09.41.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 May 2016 09:41:52 -0700 (PDT) Date: Wed, 18 May 2016 11:41:34 -0500 From: Justin Hibbits To: Scott Long Cc: Warner Losh , Scott Long , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r300154 - head/sys/net Message-ID: <20160518114134.7a32e69e@zhabar.knownspace> In-Reply-To: <7EC6D845-E9EE-4D9E-988B-D433526BAAB1@yahoo.com> References: <201605181545.u4IFjCKD030751@repo.freebsd.org> <20160518105033.1eae7432@zhabar.knownspace> <7EC6D845-E9EE-4D9E-988B-D433526BAAB1@yahoo.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; powerpc64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2016 16:41:54 -0000 #if (defined(__powerpc__) && !defined(__powerpc64__)) || (defined(__mips__) && !defined(__mips64__)) should work. - Justin On Wed, 18 May 2016 10:40:27 -0600 Scott Long wrote: > What should I use instead? > > Scott > > > On May 18, 2016, at 10:03 AM, Warner Losh wrote: > > > > Ditto with mips. > > > > On Wed, May 18, 2016 at 9:50 AM, Justin Hibbits > > wrote: On Wed, 18 May 2016 15:45:12 +0000 > > (UTC) Scott Long wrote: > > > > > Author: scottl > > > Date: Wed May 18 15:45:12 2016 > > > New Revision: 300154 > > > URL: https://svnweb.freebsd.org/changeset/base/300154 > > > > > > Log: > > > Activate the NO_64BIT_ATOMICS code for mips and powerpc > > > > > > Modified: > > > head/sys/net/mp_ring.c > > > > > > Modified: head/sys/net/mp_ring.c > > > ============================================================================== > > > --- head/sys/net/mp_ring.c Wed May 18 15:44:45 2016 > > > (r300153) +++ head/sys/net/mp_ring.c Wed May 18 15:45:12 > > > 2016 (r300154) @@ -37,15 +37,17 @@ __FBSDID("$FreeBSD$"); > > > #include > > > #include > > > > > > - > > > - > > > -#include > > > +#if defined(__powerpc__) || defined(__mips__) > > > +#define NO_64BIT_ATOMICS > > > +#endif > > > > > > #if defined(__i386__) > > > #define atomic_cmpset_acq_64 atomic_cmpset_64 > > > #define atomic_cmpset_rel_64 atomic_cmpset_64 > > > #endif > > > > > > +#include > > > + > > > union ring_state { > > > struct { > > > uint16_t pidx_head; > > > > > > > powerpc64 defines both __powerpc__ and __powerpc64__, so you're > > killing atomics on powerpc64 with this. > > > > - Justin > > > > >