From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE146C67871 for ; Mon, 9 Jan 2023 21:36:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237817AbjAIVgG (ORCPT ); Mon, 9 Jan 2023 16:36:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238099AbjAIVey (ORCPT ); Mon, 9 Jan 2023 16:34:54 -0500 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E1911D0F5 for ; Mon, 9 Jan 2023 13:34:24 -0800 (PST) Received: by mail-il1-x133.google.com with SMTP id bp26so5550691ilb.3 for ; Mon, 09 Jan 2023 13:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=Iiohs4OX9XBKS+GKVydSssXpcN8+3z5dH6Af2xFixnI=; b=F2JUTas3O84KCd9N1b8rW6yhXOOcRlUIS4pLSWHuNpgDqG67+dxFz3PT/9Ro3uMjsh Ku6VfEHkLueFZ4ZqFMJxN6oeh9fJtkPDltSlRIPrXXxmQwYprfq8RqYb8SDE+sZHw6v0 sWGcWwv+GIcwcMVfCN/QIctvIVy7CC5AKVhiuAuv7CLSLDF5sgBjeG4+CQhMFalZtqzf lBsgbo3zFbkJSaWfcMq1oPzDPKJQS7hpCLW2F2/VAwxOy+vJ8xcTvqAkvEDVvsAz+8kM 8yQ3o3j2giPqAuT0Xm1TNdHVQMNL6peijLxJ6u1cXRsC4PAZKmsSUIqYQgPm2R5H9zBf NLOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Iiohs4OX9XBKS+GKVydSssXpcN8+3z5dH6Af2xFixnI=; b=eXCvUUihK9QacF02kNHYqUVHBT2pxfSOTFtg+OVBy1YHN6GI6HCpj/As5YquVwpKe4 of0rs6p+0sWUhAoZk2MRKq8GunUy2GJ2Afg5HlmZW5BEQ8ODC/phB8Kv65ZnUKAdkah0 YqdHXZ/bCUxWPG1qAnntYoZSqVjOMB7ewRdNBWUE6b4iYHYFfczEeOjbHdPGYgYz7r4D G/rn/8nEMWoTGZ5zhDLb2bHFc7oQYgoWrYaAIalpYqayec1rApfs3XC+RCxC24HPtZPy R83MjqJkw3IUDObKu3Cvs7PHwz2TzvwNYY6wXq7gUVBRuQBnUDuTqvJ8wuStUWT0seCY SpaQ== X-Gm-Message-State: AFqh2ko947MkVMZ/TFowWyzDz2HGqyxN6YUQFTqn+goCFpeacazDtDqJ /3tZze1H7qouUXxg13SdbvkobQ== X-Google-Smtp-Source: AMrXdXtKrvQeuV+vRfi5+eIyZeEbd5Fdn8g+g5p661EdI40Q/KmLoIeZI8enRyg6WqGfCWqFP8IYUQ== X-Received: by 2002:a92:d111:0:b0:30c:d9f:fe00 with SMTP id a17-20020a92d111000000b0030c0d9ffe00mr42357769ilb.23.1673300063797; Mon, 09 Jan 2023 13:34:23 -0800 (PST) Received: from [172.22.22.4] ([98.61.227.136]) by smtp.googlemail.com with ESMTPSA id w8-20020a056e0213e800b0030c2667fe17sm3045972ilj.80.2023.01.09.13.34.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Jan 2023 13:34:23 -0800 (PST) Message-ID: Date: Mon, 9 Jan 2023 15:34:21 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 From: Alex Elder Subject: Re: [PATCH v8 04/28] arm64: smccc: Include alternative-macros.h To: Elliot Berman , Bjorn Andersson , Mark Rutland , Lorenzo Pieralisi , Sudeep Holla Cc: Murali Nalajala , Trilok Soni , Srivatsa Vaddagiri , Carl van Schaik , Prakruthi Deepak Heragu , Arnd Bergmann , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Jonathan Corbet , Bagas Sanjaya , Catalin Marinas , Will Deacon , Jassi Brar , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org References: <20221219225850.2397345-1-quic_eberman@quicinc.com> <20221219225850.2397345-5-quic_eberman@quicinc.com> Content-Language: en-US In-Reply-To: <20221219225850.2397345-5-quic_eberman@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 12/19/22 4:58 PM, Elliot Berman wrote: > Fix build error when CONFIG_ARM64_SVE is selected and > asm/alternative-macros.h wasn't implicitly included by another header. > > In file included from arch/arm64/gunyah/gunyah_hypercall.c:6: > arch/arm64/gunyah/gunyah_hypercall.c: In function `gh_hypercall_msgq_send': > ./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 If this is correct (and I presume it is), I think this patch should be posted separate from (and before) the rest of the series. -Alex > --- > include/linux/arm-smccc.h | 1 + > 1 file changed, 1 insertion(+) > > 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)