From nobody Thu Jul 23 22:26:32 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 172FC24B28 for ; Fri, 19 Jun 2026 11:46:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781869599; cv=none; b=myE2oAZpxlBRGDJa/x+jYHEOijX9qMp+vkrwANxcYjqGn3kvKwAK8m0qya+7Y0ArJT1cvEIX5GkDCIJ45cEBBRyYEmcMSZhr/q+3RoHuiq+CVSTACbUYJkQ9JfNRq2Tds9koCaRuGx7LdD79oH3drnHdetnX/09ovX8HqLyycps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781869599; c=relaxed/simple; bh=TbIkXQyL3HcG98ja7KJNLmHR/kAWP+nK+L//0ZgqjQ4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XJdjwZ5EWhuyIi1825GNRnf0AfITkcN7Yt3oPZvFri5aP1U4KLPt1+2ERT+JvdPEG30NG08T6mvZaVLjT0JN+hDxThum+XdQfhtazYty83WVVHrgL6M8vwvtw1Grpqlhtbl8AsdbRAuXp+xta8ZuFNRsbfE9u8O7bHcBQjNXbQM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XGaNfcKd; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XGaNfcKd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781869597; 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=zuV9wleDPJXQ4MvGs+4yzuJAS7DRs0hr8UQ5BwqC7Iw=; b=XGaNfcKd1U2QGCRmKPUNYTWENIgIjZT36nRIrm3D9iHesK1aGXjPXdP5hzOkFV3CYzf2dT kyzfaPrKzM73kwWuTOS/mQrug2cXSBliHLOp/+UfaYDAIBXJtK5166OKcAxM3Fl+vgthLL kjDxTUWusFw9Tjj175ypyDauyZd7MJo= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-456-RqXo4HBnMQiB0DNLrD7kpg-1; Fri, 19 Jun 2026 07:46:32 -0400 X-MC-Unique: RqXo4HBnMQiB0DNLrD7kpg-1 X-Mimecast-MFC-AGG-ID: RqXo4HBnMQiB0DNLrD7kpg_1781869591 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 522C0184556C; Fri, 19 Jun 2026 11:46:31 +0000 (UTC) Received: from thuth-p1g4.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 90D95195604E; Fri, 19 Jun 2026 11:46:06 +0000 (UTC) From: Thomas Huth To: Juergen Gross , Stefano Stabellini Cc: Oleksandr Tyshchenko , xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Subject: [PATCH] xen: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Date: Fri, 19 Jun 2026 13:45:47 +0200 Message-ID: <20260619114547.159637-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-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Juergen Gross --- Note: This patch has been split from an earlier bigger patch of mine to ease reviewing. include/xen/interface/xen-mca.h | 4 ++-- include/xen/interface/xen.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/xen/interface/xen-mca.h b/include/xen/interface/xen-mc= a.h index 1c9afbe8cc260..8f5815f1d3ab3 100644 --- a/include/xen/interface/xen-mca.h +++ b/include/xen/interface/xen-mca.h @@ -50,7 +50,7 @@ /* OUT: There was no machine check data to fetch. */ #define XEN_MC_NODATA 0x2 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* vIRQ injected to Dom0 */ #define VIRQ_MCA VIRQ_ARCH_0 =20 @@ -388,5 +388,5 @@ struct xen_mce_log { #define MCE_GET_LOG_LEN _IOR('M', 2, int) #define MCE_GETCLEAR_FLAGS _IOR('M', 3, int) =20 -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __XEN_PUBLIC_ARCH_X86_MCA_H__ */ diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 0ca23eca2a9cc..40c9793e98805 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h @@ -337,7 +337,7 @@ #define MMUEXT_MARK_SUPER 19 #define MMUEXT_UNMARK_SUPER 20 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct mmuext_op { unsigned int cmd; union { @@ -415,7 +415,7 @@ DEFINE_GUEST_HANDLE_STRUCT(mmuext_op); =20 #define MAX_VMASST_TYPE 5 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 typedef uint16_t domid_t; =20 @@ -760,11 +760,11 @@ struct tmem_op { =20 DEFINE_GUEST_HANDLE(u64); =20 -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ =20 /* In assembly code we cannot use C numeric constant suffixes. */ #define mk_unsigned_long(x) x =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 #endif /* __XEN_PUBLIC_XEN_H__ */ --=20 2.54.0