History

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

Linus Torvalds committed 6 years ago

Commit 322bf2d2 parents 1716f53 264b0d22 files · +6 −7Browse files

Showing the changes to include/linux (1 of 2 files). Show all

Unified · Split

include/linux/percpu-defs.h+1−2
@@ -175,8 +175,7 @@ · 174 unmodified lines
175175 * Declaration/definition used for per-CPU variables that should be accessed
176176 * as decrypted when memory encryption is enabled in the guest.
177177 */
178−#if defined(CONFIG_VIRTUALIZATION) && defined(CONFIG_AMD_MEM_ENCRYPT)
179−
178+#ifdef CONFIG_AMD_MEM_ENCRYPT
180179 #define DECLARE_PER_CPU_DECRYPTED(type, name) \
181180 DECLARE_PER_CPU_SECTION(type, name, "..decrypted")
182181