diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 22:27:33 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 22:27:33 +0000 |
| commit | 322bf2d3446aabdaf5e8887775bd9ced80dbc0f0 (patch) | |
| tree | 47df4651b02d46bd8e5f1fccfe21bd15d1ba73f3 /include/linux | |
| parent | 1716f536425f72cca4b0ff42c4be9466ed38dbd9 (diff) | |
| parent | 264b0d2bee148073c117e7bbbde5be7125a53be1 (diff) | |
Merge branch 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu
Pull percpu updates from Dennis Zhou:
"Separate out variables that can be decrypted into their own page
anytime encryption can be enabled and fix __percpu annotations in
asm-generic for sparse"
* 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
percpu: Separate decrypted varaibles anytime encryption can be enabled
percpu: fix __percpu annotation in asm-generic
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/percpu-defs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index a6fabd865211..176bfbd52d97 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -175,8 +175,7 @@ * Declaration/definition used for per-CPU variables that should be accessed * as decrypted when memory encryption is enabled in the guest. */ -#if defined(CONFIG_VIRTUALIZATION) && defined(CONFIG_AMD_MEM_ENCRYPT) - +#ifdef CONFIG_AMD_MEM_ENCRYPT #define DECLARE_PER_CPU_DECRYPTED(type, name) \ DECLARE_PER_CPU_SECTION(type, name, "..decrypted") |