From 4e45cae5e8af966bdc76af6256c709cd4107b7de Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 18 Apr 2023 12:04:03 +0100 Subject: [PATCH] ANDROID: firmware/psci: Remove PSCI_1_1_FN64_MEM_PROTECT definition The PSCI MEM_PROTECT function does not have a 64-bit function identifier, so remove the unused definition which was erroneously left intact when applying fe3157f3286b ("ANDROID: KVM: arm64: Use 32-bit function ID for PSCI MEM_PROTECT call"). Bug: 260316363 Cc: Quentin Perret Signed-off-by: Will Deacon Change-Id: Ica948b202bf01175b6ab0961307899d269649880 --- include/uapi/linux/psci.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h index 4dd7734cede4..42a40ad3fb62 100644 --- a/include/uapi/linux/psci.h +++ b/include/uapi/linux/psci.h @@ -69,8 +69,6 @@ #define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18) #define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(20) -#define PSCI_1_1_FN64_MEM_PROTECT PSCI_0_2_FN64(19) - /* PSCI v0.2 power state encoding for CPU_SUSPEND function */ #define PSCI_0_2_POWER_STATE_ID_MASK 0xffff #define PSCI_0_2_POWER_STATE_ID_SHIFT 0