From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D714279903 for ; Fri, 19 Jun 2026 13:47:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781876854; cv=none; b=IJgRp8JirN8bJBh6DHhYqZmqWAgeRddcCjYNZqd7KEpBVCLyB4pueX4dHzx+EU7D7Sgyn4t7XFB8aQTRWvGaaHv2mgcLPpcluh/mTXRz/7QKuF4lm5Cu9HHJgaoMxWytdSwLztvkwgyiW0P5skimTERbgYm4R5Yqp0fGZrzzEsE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781876854; c=relaxed/simple; bh=zVvTf9OGn8z0baNlZ4I7CTd+LyPD32vKdMSHn9sLqfY=; h=From:Date:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=afoJ58V0hXdCnveEwLt78YmOCA4yp2YnFLuyY+x+WU7fytQ7v/B0QNjax9C8vAZSoKwCr25Jc2+NOcSZnTfwtqxNwMrNysus99mDc4toSPcN/0zWBSJWjGCaT6EfmittDgEQMlWa94xpeziL9AmJRbp9Bn24DpM8GTZNZvOlGNE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=n9InLfnH; arc=none smtp.client-ip=209.85.128.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n9InLfnH" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-7fd8446a1cdso22029327b3.1 for ; Fri, 19 Jun 2026 06:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781876852; x=1782481652; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=sXV5oNlA1IPuiswqKfQP/2Zw+Tnxv8EPvV6j9S2UFbg=; b=n9InLfnHRz2fC/tjt837Eo5TZX55S1A0rNa8O0QbNc0ihwzqX2X1+qquU5sxTQ6HfI sjXIDJcNINg/SUekImIkDrn0XBhVck5cp6SjVp+ORU23+du2QRNNK1fxlrmuAYShCgBw HgtHarlsQkxc5I3AAWQVzL63/GkXs3TXhG4XMUyxOM0AFZMw6Nw0BC35bdnULGhzLhcw mx5gqpkMPKdgx1HR5XnDdHJY6eidX/mQVI5gssJ5reY49bDlbdSZvrpZDtTOmtnb66fl Yk5HajSyjyJnrso4T3xgWoKAkWxtlWqvkuBvOUMFL0i2tpgu5nNQXmX+3zs/7NVPS9Qj 3oXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781876852; x=1782481652; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sXV5oNlA1IPuiswqKfQP/2Zw+Tnxv8EPvV6j9S2UFbg=; b=ArJRXOUPmQeKspLubF8gTboLogHILlxFHIPANPymH9H0lNu5fWtxHdphcPiw7bLtyY 3Na4jo6y6fHxdYcnDVa4Wy6EWnq7XYfRfesRcM089Px5LbO4db+D5JpivPvnideUhsof LJIMXOuG9B2D6cJb+OdMNz+Z2I0Cu9H3ZLNY0x67L/BH3wKY4q+u/GZl5qkvOVFyBSgr 373ayJZ3IUw9b3VAiGMx7Hi7PWzQq+F5bE4B4LM2BwQJLUYK7+rQaNyTaua5X+o5myoG WYGNh5/R95imCC8oOgenBHq9/ffMryUKKctjJl6LHDtkAOh9GNFcm3e4LlLVMMj1zEjo CUbA== X-Forwarded-Encrypted: i=1; AFNElJ/fRPml6DDD52dH1QM6K9pDjxJu3o/um+vMznoIbMo2GlgKwcRQotnkPx4dLUf2Lc+yGm6j9tpQQK7unKg=@vger.kernel.org X-Gm-Message-State: AOJu0YxvDlO11oFY1lL/IH0QfrLgwivWAg0RqXtKOypT3YRq2njiK6aU LchmgcwcRSstIjoDryPN1wEZyDryjUlJJfVsw5NE3Qwvzjs7ifTUbFwA X-Gm-Gg: AfdE7cm0RZtnpoQ+10BxWTaFHhz2sV0ZpcQ1pWnB2I+2DdD6LvASSL3XzMi4Pq9KGN/ zzjiVX6JjsSBfscmAvpv4QHBkPtlU9E39mRdL0ekMDfmWudCe1sqBgRfab+t7ffLbeT9nkpkkbe iEWwWCCIV/Qe0EtUiN8mhYPGUHZyTPeuRxBd4GfcwIm7zO8QQss/uRXgh3X2wwQEtBhq00mNlXK 6jSydnJfp3SPmx/yephovPzmRBDGCeZN+U/d2yWAn5ROM783roN8fZqJRHpkCh/BZQuZ+91r122 JRoa+e1zszyI7Fq+PdOoJC9pjZO63rKEXfItbKhAolR7gAGLZfMFFYRDRSD+9xUo1LDII86n+GZ ptMv5JVSsjSzBxxMNEb8dYaJTacl5sowB1k0DtVawiGp1dfx2i/bqeQHVPWJT3vvGY3OwGZBlbw AD+Fc6GfrNcyzX1zw9IqCL+s1rO0SxDxy2ewuhSRj5WrUV8Q== X-Received: by 2002:a05:690c:4d41:b0:7dc:7764:3e83 with SMTP id 00721157ae682-801314d1b99mr33410037b3.17.1781876852214; Fri, 19 Jun 2026 06:47:32 -0700 (PDT) Received: from localhost (syn-035-130-123-074.biz.spectrum.com. [35.130.123.74]) by smtp.gmail.com with ESMTPSA id 00721157ae682-8011daf0371sm11520597b3.44.2026.06.19.06.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2026 06:47:31 -0700 (PDT) From: Yury Norov X-Google-Original-From: Yury Norov Date: Fri, 19 Jun 2026 09:47:31 -0400 To: Thomas Huth Cc: Yury Norov , Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: Re: [PATCH] bitmap: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Message-ID: References: <20260619113441.146717-1-thuth@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260619113441.146717-1-thuth@redhat.com> On Fri, Jun 19, 2026 at 01:34:41PM +0200, Thomas Huth wrote: > From: Thomas Huth > > While the GCC and Clang compilers already define __ASSEMBLER__ > automatically when compiling assembly code, __ASSEMBLY__ is a > macro that only gets defined by the Makefiles in the kernel. > This can be very confusing when switching between userspace > and kernelspace coding, or when dealing with uapi headers that > rather should use __ASSEMBLER__ instead. So let's standardize now > on the __ASSEMBLER__ macro that is provided by the compilers. > > This is a completely mechanical patch (done with a simple "sed -i" > statement). > > Signed-off-by: Thomas Huth Added in bitmap-for-next for testing. Thanks, Yury > --- > Note: This patch has been split from an earlier patch of mine > to ease reviewing. > > include/linux/bitmap.h | 4 ++-- > include/linux/bits.h | 6 +++--- > tools/include/linux/bits.h | 6 +++--- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h > index b007d54a9036a..8854acf77869a 100644 > --- a/include/linux/bitmap.h > +++ b/include/linux/bitmap.h > @@ -2,7 +2,7 @@ > #ifndef __LINUX_BITMAP_H > #define __LINUX_BITMAP_H > > -#ifndef __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > > #include > #include > @@ -894,6 +894,6 @@ void bitmap_write(unsigned long *map, unsigned long value, > #define bitmap_set_value8(map, value, start) \ > bitmap_write(map, value, start, BITS_PER_BYTE) > > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLER__ */ > > #endif /* __LINUX_BITMAP_H */ > diff --git a/include/linux/bits.h b/include/linux/bits.h > index a40cc861b3a7c..b7509f15718e6 100644 > --- a/include/linux/bits.h > +++ b/include/linux/bits.h > @@ -17,7 +17,7 @@ > * position @h. For example > * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. > */ > -#if !defined(__ASSEMBLY__) > +#if !defined(__ASSEMBLER__) > > /* > * Missing asm support > @@ -75,7 +75,7 @@ > #define BIT_U32(nr) BIT_TYPE(u32, nr) > #define BIT_U64(nr) BIT_TYPE(u64, nr) > > -#else /* defined(__ASSEMBLY__) */ > +#else /* defined(__ASSEMBLER__) */ > > /* > * BUILD_BUG_ON_ZERO is not available in h files included from asm files, > @@ -84,6 +84,6 @@ > #define GENMASK(h, l) __GENMASK(h, l) > #define GENMASK_ULL(h, l) __GENMASK_ULL(h, l) > > -#endif /* !defined(__ASSEMBLY__) */ > +#endif /* !defined(__ASSEMBLER__) */ > > #endif /* __LINUX_BITS_H */ > diff --git a/tools/include/linux/bits.h b/tools/include/linux/bits.h > index a40cc861b3a7c..b7509f15718e6 100644 > --- a/tools/include/linux/bits.h > +++ b/tools/include/linux/bits.h > @@ -17,7 +17,7 @@ > * position @h. For example > * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. > */ > -#if !defined(__ASSEMBLY__) > +#if !defined(__ASSEMBLER__) > > /* > * Missing asm support > @@ -75,7 +75,7 @@ > #define BIT_U32(nr) BIT_TYPE(u32, nr) > #define BIT_U64(nr) BIT_TYPE(u64, nr) > > -#else /* defined(__ASSEMBLY__) */ > +#else /* defined(__ASSEMBLER__) */ > > /* > * BUILD_BUG_ON_ZERO is not available in h files included from asm files, > @@ -84,6 +84,6 @@ > #define GENMASK(h, l) __GENMASK(h, l) > #define GENMASK_ULL(h, l) __GENMASK_ULL(h, l) > > -#endif /* !defined(__ASSEMBLY__) */ > +#endif /* !defined(__ASSEMBLER__) */ > > #endif /* __LINUX_BITS_H */ > -- > 2.54.0