diff options
| author | Kees Cook <keescook@chromium.org> | 2022-11-08 21:58:57 +0300 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2022-11-08 21:58:57 +0300 |
| commit | 8abfff25b3e2c8f51049295f86dd257492ac1969 (patch) | |
| tree | 8d0a6dfc0a24ab17827443d135416b10207fa398 /include | |
| parent | 4b21d25bf519c9487935a664886956bb18f04f6d (diff) | |
| parent | 000f8870a47bdc36730357883b6aef42bced91ee (diff) | |
| download | linux-8abfff25b3e2c8f51049295f86dd257492ac1969.tar.xz | |
Merge branch 'for-linus/hardening' into for-next/hardening
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index c15de165ec8f..f40a0e078bd0 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -341,6 +341,7 @@ #define DATA_DATA \ *(.xiptext) \ *(DATA_MAIN) \ + *(.data..decrypted) \ *(.ref.data) \ *(.data..shared_aligned) /* percpu related */ \ MEM_KEEP(init.data*) \ @@ -989,7 +990,6 @@ #ifdef CONFIG_AMD_MEM_ENCRYPT #define PERCPU_DECRYPTED_SECTION \ . = ALIGN(PAGE_SIZE); \ - *(.data..decrypted) \ *(.data..percpu..decrypted) \ . = ALIGN(PAGE_SIZE); #else |