| Message ID | 20180612003224.3658-4-labbott@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Laura Abbott <labbott@redhat.com> wrote: > > Both the kernel and the vDSO need to have unique build ids. > Insert the build salt section to make the build ids unique. > > Signed-off-by: Laura Abbott <labbott@redhat.com> > --- > arch/x86/entry/vdso/vdso-layout.lds.S | 3 ++- > arch/x86/kernel/vmlinux.lds.S | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) Acked-by: Ingo Molnar <mingo@kernel.org> What is the upstream merge plan for this series? kbuild tree? Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/21/2018 05:43 AM, Ingo Molnar wrote: > > * Laura Abbott <labbott@redhat.com> wrote: > >> >> Both the kernel and the vDSO need to have unique build ids. >> Insert the build salt section to make the build ids unique. >> >> Signed-off-by: Laura Abbott <labbott@redhat.com> >> --- >> arch/x86/entry/vdso/vdso-layout.lds.S | 3 ++- >> arch/x86/kernel/vmlinux.lds.S | 1 + >> 2 files changed, 3 insertions(+), 1 deletion(-) > > Acked-by: Ingo Molnar <mingo@kernel.org> > > What is the upstream merge plan for this series? kbuild tree? > > Thanks, > > Ingo > There was an alternate proposal that requires slightly fewer changes that needs to be cleaned up and submitted. I do think the plan is for the series to eventually go through the kbuild tree. Thanks, Laura -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi. 2018-06-22 0:58 GMT+09:00 Laura Abbott <labbott@redhat.com>: > On 06/21/2018 05:43 AM, Ingo Molnar wrote: >> >> >> * Laura Abbott <labbott@redhat.com> wrote: >> >>> >>> Both the kernel and the vDSO need to have unique build ids. >>> Insert the build salt section to make the build ids unique. >>> >>> Signed-off-by: Laura Abbott <labbott@redhat.com> >>> --- >>> arch/x86/entry/vdso/vdso-layout.lds.S | 3 ++- >>> arch/x86/kernel/vmlinux.lds.S | 1 + >>> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> >> Acked-by: Ingo Molnar <mingo@kernel.org> >> >> What is the upstream merge plan for this series? kbuild tree? >> >> Thanks, >> >> Ingo >> > > There was an alternate proposal that requires slightly fewer > changes that needs to be cleaned up and submitted. I do > think the plan is for the series to eventually go through > the kbuild tree. Yes. V5 is welcome. Thanks.
diff --git a/arch/x86/entry/vdso/vdso-layout.lds.S b/arch/x86/entry/vdso/vdso-layout.lds.S index acfd5ba7d943..a331c1d41360 100644 --- a/arch/x86/entry/vdso/vdso-layout.lds.S +++ b/arch/x86/entry/vdso/vdso-layout.lds.S @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include <asm/vdso.h> - +#include <asm-generic/vmlinux.lds.h> /* * Linker script for vDSO. This is an ELF shared object prelinked to * its virtual address, and with only one read-only segment. @@ -74,6 +74,7 @@ SECTIONS .fake_shstrtab : { *(.fake_shstrtab) } :text + BUILD_SALT .note : { *(.note.*) } :text :note .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 5e1458f609a1..b61c33fa2617 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -172,6 +172,7 @@ SECTIONS _edata = .; } :data + BUILD_SALT BUG_TABLE ORC_UNWIND_TABLE
Both the kernel and the vDSO need to have unique build ids. Insert the build salt section to make the build ids unique. Signed-off-by: Laura Abbott <labbott@redhat.com> --- arch/x86/entry/vdso/vdso-layout.lds.S | 3 ++- arch/x86/kernel/vmlinux.lds.S | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)