KVM needs the KEYSRC_SWRAND and KEYSRC_HWRAND macro definitions. Move them to <asm/keylocker.h> Signed-off-by: Robert Hoo <robert.hu@xxxxxxxxxxxxxxx> Reviewed-by: Tony Luck <tony.luck@xxxxxxxxx> Cc: x86@xxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx --- arch/x86/include/asm/keylocker.h | 3 +++ arch/x86/kernel/keylocker.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/keylocker.h b/arch/x86/include/asm/keylocker.h index 74b8063..9836e68 100644 --- a/arch/x86/include/asm/keylocker.h +++ b/arch/x86/include/asm/keylocker.h @@ -9,6 +9,9 @@ #include <linux/bits.h> #include <asm/msr.h> +#define KEYSRC_SWRAND 0 +#define KEYSRC_HWRAND BIT(1) + #define KEYLOCKER_CPUID 0x019 #define KEYLOCKER_CPUID_EAX_SUPERVISOR BIT(0) #define KEYLOCKER_CPUID_EBX_AESKLE BIT(0) diff --git a/arch/x86/kernel/keylocker.c b/arch/x86/kernel/keylocker.c index 5a784492..17bb2e8 100644 --- a/arch/x86/kernel/keylocker.c +++ b/arch/x86/kernel/keylocker.c @@ -66,8 +66,6 @@ void flush_keylocker_data(void) keydata.valid = false; } -#define KEYSRC_SWRAND 0 -#define KEYSRC_HWRAND BIT(1) #define KEYSRC_HWRAND_RETRY 10 /** -- 1.8.3.1
