From nobody Wed Jun 17 01:51:18 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 1A9BE3D567D for ; Tue, 21 Apr 2026 14:41:09 +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=1776782471; cv=none; b=gu5xqZGdwWa3CDBocbu9KG/DMTYbRfIKgGCt8F9wR9pw7ahCnjulRMo4kvQzAe9A3P8A4LrChp2gKyY7LXvjeZzsIbiCMmT5Q9SzarUGIckwlzAkAawcLELBnwsDkazmZae9cvtKtZhbDyuyuStTbnCROQUL2PZP+DZyVseCrW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776782471; c=relaxed/simple; bh=K1/Ve1D1ONRhG3q+RqpWFz1mzt6rAJFA1O1m05hp50w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=O265QqOHSq+tat0JjLhyA6ykAcmLfhseWRXFyl3V+JZtbn79Y2oJSx2RgLMR3DWsAYAEgV0df6oj51mQI6qTt8Nm9cXlYikpJmMDHJyAY/6YEpSMFUcgISp4DPvP9f54q1Ri+FKjna75/yiFVLvsTpiN/HMsFkMq5jTd7n30m7o= 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=C/zp/k/1; 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="C/zp/k/1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776782469; 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=AKVnTheodda82en/9exNMRlZ0A5yNXj4CXRj8lXBAx4=; b=C/zp/k/1LTWpG08V0wW2h9fXLu0/xlrv0dACUFPwJ0AK1MlXlzxfXAlXYZ/78t9YONsJ3x tadjuv0uzFLIdPqlejMXxHZwCIhxUczfdAAL/KBAH1XFgpU4x5VftxOj4B4yPFAaw81cRC rfEOsMDrm0LMkmOGjdOydqNf4Lg4Yh0= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-534-RfVSJj5ZP82U9vXvE1AdwA-1; Tue, 21 Apr 2026 10:41:04 -0400 X-MC-Unique: RfVSJj5ZP82U9vXvE1AdwA-1 X-Mimecast-MFC-AGG-ID: RfVSJj5ZP82U9vXvE1AdwA_1776782463 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8E66519560AB; Tue, 21 Apr 2026 14:41:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.49.140]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 85BB11956095; Tue, 21 Apr 2026 14:41:00 +0000 (UTC) From: Thomas Huth To: Mark Rutland , Lorenzo Pieralisi , Sudeep Holla , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] smccc: Replace __ASSEMBLY__ with __ASSEMBLER__ Date: Tue, 21 Apr 2026 16:40:58 +0200 Message-ID: <20260421144058.561186-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. Signed-off-by: Thomas Huth --- Note: This patch has been split from an earlier patch series of mine to ease reviewing include/linux/arm-smccc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 50b47eba7d015..96d7a61055a70 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -8,7 +8,7 @@ #include #include =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include #endif =20 @@ -302,7 +302,7 @@ #define SMCCC_RET_NOT_REQUIRED -2 #define SMCCC_RET_INVALID_PARAMETER -3 =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 #include #include @@ -353,7 +353,7 @@ s32 arm_smccc_get_soc_id_version(void); */ s32 arm_smccc_get_soc_id_revision(void); =20 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ =20 /* * Returns whether a specific hypervisor UUID is advertised for the @@ -402,7 +402,7 @@ static inline u32 smccc_uuid_to_reg(const uuid_t *uuid,= int reg) return val; } =20 -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ =20 /** * struct arm_smccc_res - Result from SMC/HVC call @@ -750,5 +750,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsig= ned long a1, }) #endif /*CONFIG_ARM64*/ =20 -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /*__LINUX_ARM_SMCCC_H*/ --=20 2.53.0