Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp7726535rwr; Wed, 10 May 2023 11:43:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ692XsvHEo3z0TPP7CjWG4dMamD7k53theUdcxdsvDqdGGnPCIn08Uz8R7BRo7ZC3DmXuxC X-Received: by 2002:a17:903:120f:b0:1ac:6d4c:c265 with SMTP id l15-20020a170903120f00b001ac6d4cc265mr15668876plh.28.1683744194018; Wed, 10 May 2023 11:43:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683744194; cv=none; d=google.com; s=arc-20160816; b=TsPVJvMOPRusT+bpmFK0IfG7LDWkhlG7qZ8f34hzv4hrIhiO/MT3htqpu6MjAksdi3 h6WjdRGjcFEF/Gu3ZJ5eQN5RznLxHYkIMhnQMTwkwtrLoQoLs7I+ES8VgSPjgC1Vu4Ws jSXNDJReLLo99g/re0eCDfyPEDl3UZrZPnyW38/LbCTCFULFspOtd/v4EGekSt3dqY1B M7iB+DETJ9ubiYLkvp0cQJ3IFocTQJTw8v11EvtGs2pARTEt1D/cBJlnISPSlJe4EnNc Qaf5v/is5xf+nB28Acej7TkTYvLOh9uEepUl9tq9St82tdRqlpQxnhPsnJXF+EUVRa1J 8+Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+NzFVM00EVqII97kF8HEz/nOooSX77FvHK45gvFOFQg=; b=isKS76T+n3pI/zZhf98FnNgVkPpWU/H01jbEugiEZ8t92m5oM0clupoIQ+P8u4aeSE M8ge7jrEMsLU6EEFN7pDMUKgetq8gcvxZzy1twF9FQ8nDi9yLQG4+HE/+l7jpuF5EQyv HZWxvOmoZGcZSrW1JknM6EeEejNb+2AJBT+JleBJD8vsy90l98PrKQzONfrvsn3087mB APZJe9RjrpwgI2uY6XOH6jRGQDmmVjanJNPbbbNOhZqGyt8C2sl9b+JH7ks1VLGcPVjf 2PtxbPiy5ES+mVifsdfw1ryBPAcBKYwJzOBM751BkUIdF1MgCPAcwLYQbzs57idTZ7zF aiow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Xce+75Gf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l16-20020a170903245000b001aad9b73ff2si4815802pls.285.2023.05.10.11.43.01; Wed, 10 May 2023 11:43:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Xce+75Gf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236092AbjEJSTK (ORCPT + 99 others); Wed, 10 May 2023 14:19:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236144AbjEJSSU (ORCPT ); Wed, 10 May 2023 14:18:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1730B83E7; Wed, 10 May 2023 11:18:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C80E963F94; Wed, 10 May 2023 18:17:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E139EC433AE; Wed, 10 May 2023 18:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683742644; bh=O5+R08c8ff/9UCItSQg4aHCY6O5NYgQTn22+Zu0iVq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xce+75GfENdMWBpO3VsBhIq+md1L1PO/sfpQ26MlP7lpDMWE8xELlYvvI7F9H6Ndi VaCKiOScuM6OKVzlkdJSlnVy7YeKReqJcuqcbEUkTBGGE3LoH+hYCX5pZPbqBVuSe8 zO87kovaSZAGKDRIS8UaMgLQGxxZcOeXNjWxbrOaVdyRqjIDOyabSjgel2z2fI3mxz GHx65Y2Rf8mCE4QpBXQ9G+CNjMsVFSYNL3Gq9EhIJIUZTZs+FQIpCfbiwqfK5kmUEu rZZLhD/RTYr8j2Dtrenmxh2MDewaUdsaqqsecWPd69AkjSaE692PbpvFo7MIVyE46/ He9ag/wpppS/g== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 06C1CCE21CB; Wed, 10 May 2023 11:17:19 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, akiyks@gmail.com, linux-doc@vger.kernel.org, kernel-team@meta.com, "Paul E. McKenney" , Will Deacon , Peter Zijlstra , Boqun Feng , Mark Rutland , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH locking/atomic 17/19] x86/atomic.h: Remove duplicate kernel-doc headers Date: Wed, 10 May 2023 11:17:15 -0700 Message-Id: <20230510181717.2200934-17-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <19135936-06d7-4705-8bc8-bb31c2a478ca@paulmck-laptop> References: <19135936-06d7-4705-8bc8-bb31c2a478ca@paulmck-laptop> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Scripting the kernel-doc headers resulted in a few duplicates. Remove the duplicates from the x86-specific files. Reported-by: Akira Yokosawa Signed-off-by: Paul E. McKenney Cc: Will Deacon Cc: Peter Zijlstra Cc: Boqun Feng Cc: Mark Rutland Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: --- arch/x86/include/asm/atomic.h | 60 ----------------------------------- 1 file changed, 60 deletions(-) diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h index 5e754e895767..5df979d65fb5 100644 --- a/arch/x86/include/asm/atomic.h +++ b/arch/x86/include/asm/atomic.h @@ -69,27 +69,12 @@ static __always_inline void arch_atomic_sub(int i, atomic_t *v) : "ir" (i) : "memory"); } -/** - * arch_atomic_sub_and_test - subtract value from variable and test result - * @i: integer value to subtract - * @v: pointer of type atomic_t - * - * Atomically subtracts @i from @v and returns - * true if the result is zero, or false for all - * other cases. - */ static __always_inline bool arch_atomic_sub_and_test(int i, atomic_t *v) { return GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, e, "er", i); } #define arch_atomic_sub_and_test arch_atomic_sub_and_test -/** - * arch_atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - */ static __always_inline void arch_atomic_inc(atomic_t *v) { asm volatile(LOCK_PREFIX "incl %0" @@ -97,12 +82,6 @@ static __always_inline void arch_atomic_inc(atomic_t *v) } #define arch_atomic_inc arch_atomic_inc -/** - * arch_atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - */ static __always_inline void arch_atomic_dec(atomic_t *v) { asm volatile(LOCK_PREFIX "decl %0" @@ -110,69 +89,30 @@ static __always_inline void arch_atomic_dec(atomic_t *v) } #define arch_atomic_dec arch_atomic_dec -/** - * arch_atomic_dec_and_test - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other - * cases. - */ static __always_inline bool arch_atomic_dec_and_test(atomic_t *v) { return GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, e); } #define arch_atomic_dec_and_test arch_atomic_dec_and_test -/** - * arch_atomic_inc_and_test - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 - * and returns true if the result is zero, or false for all - * other cases. - */ static __always_inline bool arch_atomic_inc_and_test(atomic_t *v) { return GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, e); } #define arch_atomic_inc_and_test arch_atomic_inc_and_test -/** - * arch_atomic_add_negative - add and test if negative - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns true - * if the result is negative, or false when - * result is greater than or equal to zero. - */ static __always_inline bool arch_atomic_add_negative(int i, atomic_t *v) { return GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, s, "er", i); } #define arch_atomic_add_negative arch_atomic_add_negative -/** - * arch_atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - */ static __always_inline int arch_atomic_add_return(int i, atomic_t *v) { return i + xadd(&v->counter, i); } #define arch_atomic_add_return arch_atomic_add_return -/** - * arch_atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - */ static __always_inline int arch_atomic_sub_return(int i, atomic_t *v) { return arch_atomic_add_return(-i, v); -- 2.40.1