diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
| commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
| tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /arch/x86/kernel/vmlinux.lds.S | |
| parent | x86/Kconfig: Deprecate DISCONTIGMEM support for 32-bit x86 (diff) | |
| parent | Merge tag 'ceph-for-5.1-rc7' of git://github.com/ceph/ceph-client (diff) | |
| download | linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.xz linux-da398dbd7d871bae332a800f7d194af18a2a9058.zip | |
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index de94da2366e7..834659288ba9 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -362,7 +362,7 @@ SECTIONS .bss : AT(ADDR(.bss) - LOAD_OFFSET) { __bss_start = .; *(.bss..page_aligned) - *(.bss) + *(BSS_MAIN) BSS_DECRYPTED . = ALIGN(PAGE_SIZE); __bss_stop = .; |