diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-22 10:11:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-22 10:16:53 +0100 |
| commit | f14df823a61e45db6a92e1caf552d5ec64e06b1e (patch) | |
| tree | 61d480a97a060998c0c3e7da44bc3933d3924683 /arch/x86/Makefile | |
| parent | b388e57d4628eb22782bdad4cd5b83ca87a1b7c9 (diff) | |
| parent | 289d0a475c3e5be42315376d08e0457350fb8e9c (diff) | |
Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes
Conflicts:
arch/x86/entry/vdso/Makefile
We also want to change arch/x86/entry/vdso/Makefile in a followup
commit, so merge the trees for this.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index c54f835fc062..6e98c3d7af00 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -296,8 +296,7 @@ install: vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg -vdso-install-$(CONFIG_X86_32) += arch/x86/entry/vdso/vdso32.so.dbg -vdso-install-$(CONFIG_IA32_EMULATION) += arch/x86/entry/vdso/vdso32.so.dbg +vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg archprepare: checkbin checkbin: |