Messages in this thread | | | From | "Bae, Chang Seok" <> | Subject | Re: [PATCH v3 08/15] x86/power/keylocker: Restore internal wrapping key from the ACPI S3/4 sleep states | Date | Tue, 30 Nov 2021 06:56:31 +0000 |
| |
On Nov 29, 2021, at 19:30, Eric Biggers <ebiggers@kernel.org> wrote: > On Wed, Nov 24, 2021 at 12:06:53PM -0800, Chang S. Bae wrote: >> diff --git a/arch/x86/include/asm/keylocker.h b/arch/x86/include/asm/keylocker.h >> index 820ac29c06d9..4000a5eed2c2 100644 >> --- a/arch/x86/include/asm/keylocker.h >> +++ b/arch/x86/include/asm/keylocker.h >> @@ -32,9 +32,13 @@ struct iwkey { >> #ifdef CONFIG_X86_KEYLOCKER >> void setup_keylocker(struct cpuinfo_x86 *c); >> void destroy_keylocker_data(void); >> +void restore_keylocker(void); >> +extern bool valid_keylocker(void); >> #else >> #define setup_keylocker(c) do { } while (0) >> #define destroy_keylocker_data() do { } while (0) >> +#define restore_keylocker() do { } while (0) >> +static inline bool valid_keylocker { return false; } >> #endif > > This breaks the build when !CONFIG_X86_KEYLOCKER.
Ah, sorry. My bad on the last-minute change.
Thanks, Chang
| |