diff mbox series

[v5,04/13] arm64: smccc: Include alternative-macros.h

Message ID 20221011000840.289033-5-quic_eberman@quicinc.com (mailing list archive)
State New, archived
Headers show
Series Drivers for gunyah hypervisor | expand

Commit Message

Elliot Berman Oct. 11, 2022, 12:08 a.m. UTC
Fix build error when CONFIG_ARM64_SVE is selected and
asm/alternative-macros.h wasn't implicitly included by another header.

Fixes: cfa7ff959a78 ("arm64: smccc: Support SMCCC v1.3 SVE register saving hint")
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
---
 include/linux/arm-smccc.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Greg Kroah-Hartman Oct. 11, 2022, 7:22 a.m. UTC | #1
On Mon, Oct 10, 2022 at 05:08:31PM -0700, Elliot Berman wrote:
> Fix build error when CONFIG_ARM64_SVE is selected and
> asm/alternative-macros.h wasn't implicitly included by another header.
> 
> Fixes: cfa7ff959a78 ("arm64: smccc: Support SMCCC v1.3 SVE register saving hint")
> Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>

Shouldn't this be independant of this whole series and get merged now
and backported to stable kernels if it really is causing a build problem
today?

thanks,

greg k-h
Elliot Berman Oct. 11, 2022, 10:45 p.m. UTC | #2
On 10/11/2022 12:22 AM, Greg Kroah-Hartman wrote:
> On Mon, Oct 10, 2022 at 05:08:31PM -0700, Elliot Berman wrote:
>> Fix build error when CONFIG_ARM64_SVE is selected and
>> asm/alternative-macros.h wasn't implicitly included by another header.
>>
>> Fixes: cfa7ff959a78 ("arm64: smccc: Support SMCCC v1.3 SVE register saving hint")
>> Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
> 
> Shouldn't this be independant of this whole series and get merged now
> and backported to stable kernels if it really is causing a build problem
> today?

I'll drop the "Fixes:" tag here since there is no build problem today. 
asm/alternative-macros.h was already implicitly included in all the 
cases where arm-smccc.h was being included. When I introduced the Gunyah 
hypercalls, I noticed the assumption.
diff mbox series

Patch

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 <asm/alternative-macros.h>
 
 #define SMCCC_SVE_CHECK ALTERNATIVE("nop \n",  "bl __arm_smccc_sve_check \n", \
 				    ARM64_SVE)