From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: from second.openwall.net (second.openwall.net [193.110.157.125]) by inbox.vuxu.org (Postfix) with SMTP id 417B52138B for ; Thu, 18 Apr 2024 14:17:48 +0200 (CEST) Received: (qmail 15770 invoked by uid 550); 18 Apr 2024 12:15:32 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 28419 invoked from network); 18 Apr 2024 03:12:19 -0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nihaljere.xyz; s=key1; t=1713409932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OKZFSgMNDp6IgAtAB8hyHIKU9Lpu1GBXMYc7QpUp+Hg=; b=JxQElfd+O8tYeVxDhhktTF7VY/NUFaIG+Jo/UM6zDjl2Mlo79e7O7OTpxMXx3wLNC+ckwl 6MiiOJIydWhNSlrOh1cs3k5/ZzcVzWJdPmrfdRUuQY/v18/0imxy3tJ0/zEBS8Z7Ku+DDG Yuggd0QsWW/ti6YDWkXBibBxVw/SK2Y= From: Nihal Jere To: musl@lists.openwall.com Cc: Nihal Jere Date: Wed, 17 Apr 2024 22:10:17 -0500 Message-ID: <20240418031046.4383-2-nihal@nihaljere.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Subject: [musl] [PATCH] change __volatile to __volatile__ for consistency --- These look like the only two occurences of "__volatile" in musl, elsewhere "__volatile__" is used. arch/x32/atomic_arch.h | 2 +- arch/x86_64/atomic_arch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x32/atomic_arch.h b/arch/x32/atomic_arch.h index 918c2d4e..eef253db 100644 --- a/arch/x32/atomic_arch.h +++ b/arch/x32/atomic_arch.h @@ -44,7 +44,7 @@ static inline void a_or(volatile int *p, int v) #define a_and_64 a_and_64 static inline void a_and_64(volatile uint64_t *p, uint64_t v) { - __asm__ __volatile( + __asm__ __volatile__( "lock ; and %1, %0" : "=m"(*p) : "r"(v) : "memory" ); } diff --git a/arch/x86_64/atomic_arch.h b/arch/x86_64/atomic_arch.h index da4e2037..8753b700 100644 --- a/arch/x86_64/atomic_arch.h +++ b/arch/x86_64/atomic_arch.h @@ -53,7 +53,7 @@ static inline void a_or(volatile int *p, int v) #define a_and_64 a_and_64 static inline void a_and_64(volatile uint64_t *p, uint64_t v) { - __asm__ __volatile( + __asm__ __volatile__( "lock ; and %1, %0" : "=m"(*p) : "r"(v) : "memory" ); } -- 2.43.0