From patchwork Thu Jan 12 18:25:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 13098602 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CFAFC61DB3 for ; Thu, 12 Jan 2023 18:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=fjmk0D59dHF/HjfyS/YHWW+8m1klm1pu6cS7tKjzdyY=; b=DChraS9xifInJk eqTCAehXz9zh/X11iAdUYdBFoQ2DhBV8hkyeV7pl7Wvw6QVQgI23I1RNMLv+UOfLZMgTbBg/EgN3I nlANkEMQbeBmYJdsauW1AMWBDRdDRuJTF0KfBGJswfZtxnc6e1mjcHYTvU8aLq5wH5HCbFDh9QOxJ qaLvU5vBv4h5XRpV5D0RzHHP74xSaYx1i+n1UFLV9bPcM3l4DIZyX2CN2WYif4bU4z1FCGjiD4z3m zgn5+5K44JlpyVM293RUYz3AJmIfljAXWw9ZTlHGKT2CVwRmNe9hRxP02lT4sj1PY3aGc6dDkT+tF 1ii2DDoBnnemcAOHqWGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pG2HK-00GId7-KA; Thu, 12 Jan 2023 18:26:18 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pG2HH-00GIbc-5H for linux-arm-kernel@lists.infradead.org; Thu, 12 Jan 2023 18:26:16 +0000 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30CHNj22017591; Thu, 12 Jan 2023 18:26:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=Z82I5GLP+uqyDlDgupDEX6N8IYIrwtQEqaS+xCBQSTc=; b=F8eFle9tulDMuE6eQ6+AYdAXsZ1ZBeOffkgJ4Le7S4BcyeZt1+CXyEp7kDorGJkHvc/8 He7QSDnBDL1ZrYzgexmfKbs+/3qC8tBRJz9FOGye0/12sIaKGaXmt2Xwf5Fo1bwzUM7P lk9sDbMMWK8R9OX9HHbkMsBxhxfPwX3XPTZ8xr4nlAxuIK5vBWOSxIFuNAuc17t4fzk+ b19YkkDjZL+uRYjyRj8JNAA/7GlSNby1Ua8JvJrPT07hEaYkBo7ONq6iFk7ZsL6VY+qO SaxN8ub5q4Ms8Y6yjqPDYP0XNPVKU/f+TtGnaR0do16r2WJlOSaFcEyWBo0erSakovz8 LA== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3n2edusby0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jan 2023 18:26:02 +0000 Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 30CIQ1IG007043 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jan 2023 18:26:01 GMT Received: from hu-eberman-lv.qualcomm.com (10.49.16.6) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 12 Jan 2023 10:26:00 -0800 From: Elliot Berman To: Mark Rutland , Lorenzo Pieralisi , Sudeep Holla CC: Elliot Berman , , Subject: [PATCH] arm64: smccc: Include alternative-macros.h Date: Thu, 12 Jan 2023 10:25:47 -0800 Message-ID: <20230112182548.537295-1-quic_eberman@quicinc.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: DuZHONfbr5Nfy4x5LQ36DjulHaQ2raj- X-Proofpoint-ORIG-GUID: DuZHONfbr5Nfy4x5LQ36DjulHaQ2raj- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-12_10,2023-01-12_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxlogscore=634 mlxscore=0 phishscore=0 clxscore=1015 adultscore=0 bulkscore=0 impostorscore=0 spamscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301120132 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230112_102615_350197_6041E0EA X-CRM114-Status: GOOD ( 14.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fix build error when CONFIG_ARM64_SVE is selected and asm/alternative-macros.h wasn't implicitly included by another header. ./include/linux/arm-smccc.h:387:25: error: expected string literal before `ALTERNATIVE' 387 | #define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \ Signed-off-by: Elliot Berman Acked-by: Will Deacon --- include/linux/arm-smccc.h | 1 + 1 file changed, 1 insertion(+) base-commit: 68a63a412d18bd2e2577c8928139f92541afa7a6 diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 220c8c60e021..6a627cdbbdec 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -383,6 +383,7 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, /* nVHE hypervisor doesn't have a current thread so needs separate checks */ #if defined(CONFIG_ARM64_SVE) && !defined(__KVM_NVHE_HYPERVISOR__) +#include #define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \ ARM64_SVE)