Module Name: src Committed By: jmcneill Date: Sun Aug 8 13:43:09 UTC 2021
Modified Files: src/sys/arch/arm/arm: smccc.c Log Message: fix armv7 build To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/arm/smccc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/arm/smccc.c diff -u src/sys/arch/arm/arm/smccc.c:1.2 src/sys/arch/arm/arm/smccc.c:1.3 --- src/sys/arch/arm/arm/smccc.c:1.2 Sat Aug 7 21:21:49 2021 +++ src/sys/arch/arm/arm/smccc.c Sun Aug 8 13:43:09 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: smccc.c,v 1.2 2021/08/07 21:21:49 jmcneill Exp $ */ +/* $NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $ */ /*- * Copyright (c) 2021 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.2 2021/08/07 21:21:49 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -35,6 +35,12 @@ __KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1. #include <arm/arm/psci.h> #include <arm/arm/smccc.h> +#if defined(__arm__) +#define SMCCC_ARCH_ATTRIBUTE __attribute__ ((target("arch=armv7ve"))) +#else +#define SMCCC_ARCH_ATTRIBUTE +#endif + /* Minimum supported PSCI version for SMCCC discovery */ #define PSCI_VERSION_1_0 0x10000 @@ -89,7 +95,7 @@ smccc_version(void) * * Generic call interface for SMC/HVC calls. */ -int +SMCCC_ARCH_ATTRIBUTE int smccc_call(uint32_t fid, register_t arg1, register_t arg2, register_t arg3, register_t arg4, register_t *res0, register_t *res1, register_t *res2, register_t *res3)