From patchwork Thu Mar 20 15:45:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 26720 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 42B6F20143 for ; Thu, 20 Mar 2014 15:48:02 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wn1sf4021304obc.1 for ; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=LQc8pwAxD8HqAYV6To3AVhc5AmDs/7HXBcqOSVVSnHw=; b=hwpiAxB/uYVDCR3j+HWrb4n0u1T7VJTstQztcNcWgCGPjjuzFEcZE4LKJT+HDp0Yyu CLeFKLD5MAfbEOlUg8U1GpG7cUEDlucTEXGgRnNBvPPc9kgcKgp6DT6r0t69an4fvf0D ff2k2bOMjPAXVcRHDi75v0zQv402tLlXdFVcZ0F2g9vOGdJPqL/7u0tyzOlfRvjKJcKS hrWItiFfzUReVer6KWH70HVLXomI6hs3OVBYQFo0qdCaRoVrmRztHdN4Dw3YVJl50lmG 7IgoG8sU9erSABA8eRUYqGh8EfFZkGvy//BDBc2rj7iEcn7byOu/KJqj6xbH1xSX0fhj 5BNQ== X-Gm-Message-State: ALoCoQk7ChJrgXS1nDLxsD7c5M/VohPlx8mVDlMp8uaNwOKwWHzc6hL25QhAoOHW2r+A5bWghprZ X-Received: by 10.182.236.74 with SMTP id us10mr3879979obc.36.1395330481779; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.101 with SMTP id a92ls265351qga.66.gmail; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) X-Received: by 10.58.37.232 with SMTP id b8mr5542764vek.27.1395330481690; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id fi2si522887vdb.118.2014.03.20.08.48.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 08:48:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id la4so1174417vcb.3 for ; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) X-Received: by 10.52.250.236 with SMTP id zf12mr29387446vdc.9.1395330481582; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp398578vck; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) X-Received: by 10.224.152.17 with SMTP id e17mr3089968qaw.100.1395330481049; Thu, 20 Mar 2014 08:48:01 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id d8si956719qcd.65.2014.03.20.08.48.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 20 Mar 2014 08:48:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQfAf-0004Fp-PO; Thu, 20 Mar 2014 15:46:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQfAc-0004B3-Bc for xen-devel@lists.xen.org; Thu, 20 Mar 2014 15:46:14 +0000 Received: from [85.158.143.35:62421] by server-2.bemta-4.messagelabs.com id 94/19-06539-54D0B235; Thu, 20 Mar 2014 15:46:13 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1395330368!3603483!5 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26535 invoked from network); 20 Mar 2014 15:46:12 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 20 Mar 2014 15:46:12 -0000 X-IronPort-AV: E=Sophos;i="4.97,695,1389744000"; d="scan'208";a="111935219" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 20 Mar 2014 15:46:10 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.2.342.4; Thu, 20 Mar 2014 11:46:06 -0400 Received: from drall.uk.xensource.com ([10.80.16.71] helo=drall.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WQfAU-0006O2-Fu; Thu, 20 Mar 2014 15:46:06 +0000 From: Ian Campbell To: Date: Thu, 20 Mar 2014 15:45:57 +0000 Message-ID: <1395330365-9901-9-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395330336.3104.12.camel@kazak.uk.xensource.com> References: <1395330336.3104.12.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH 09/17] xen: arm: remove atomic_clear_mask() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This has no users. This brings arm32 atomic.h into sync with Linux v3.14-rc7. arm64/atomic.h requires other patches for this to be the case. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/arm32/atomic.h | 16 ---------------- xen/include/asm-arm/arm64/atomic.h | 14 -------------- 2 files changed, 30 deletions(-) diff --git a/xen/include/asm-arm/arm32/atomic.h b/xen/include/asm-arm/arm32/atomic.h index d309f66..3d601d1 100644 --- a/xen/include/asm-arm/arm32/atomic.h +++ b/xen/include/asm-arm/arm32/atomic.h @@ -117,22 +117,6 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) return oldval; } -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) -{ - unsigned long tmp, tmp2; - - prefetchw(addr); - __asm__ __volatile__("@ atomic_clear_mask\n" -"1: ldrex %0, [%3]\n" -" bic %0, %0, %4\n" -" strex %1, %0, [%3]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2), "+Qo" (*addr) - : "r" (addr), "Ir" (mask) - : "cc"); -} - #define atomic_inc(v) atomic_add(1, v) #define atomic_dec(v) atomic_sub(1, v) diff --git a/xen/include/asm-arm/arm64/atomic.h b/xen/include/asm-arm/arm64/atomic.h index b04e6d5..6b37945 100644 --- a/xen/include/asm-arm/arm64/atomic.h +++ b/xen/include/asm-arm/arm64/atomic.h @@ -110,20 +110,6 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) return oldval; } -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) -{ - unsigned long tmp, tmp2; - - asm volatile("// atomic_clear_mask\n" -"1: ldxr %0, %2\n" -" bic %0, %0, %3\n" -" stxr %w1, %0, %2\n" -" cbnz %w1, 1b" - : "=&r" (tmp), "=&r" (tmp2), "+Q" (*addr) - : "Ir" (mask) - : "cc"); -} - #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) static inline int __atomic_add_unless(atomic_t *v, int a, int u)