diff options
| author | Will Deacon <will@kernel.org> | 2020-06-22 14:35:41 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-06-23 16:47:03 +0300 |
| commit | a39060b009ca0b5b5fe0c0dab85ed437531aab52 (patch) | |
| tree | 735f34e4e687056048ef3da0e75d98a9dbe12ba9 /arch/arm64/kernel/Makefile | |
| parent | 87676cfca14171fc4c99d96ae2f3e87780488ac4 (diff) | |
| download | linux-a39060b009ca0b5b5fe0c0dab85ed437531aab52.tar.xz | |
arm64: compat: Allow 32-bit vdso and sigpage to co-exist
In preparation for removing the signal trampoline from the compat vDSO,
allow the sigpage and the compat vDSO to co-exist.
For the moment the vDSO signal trampoline will still be used when built.
Subsequent patches will move to the sigpage consistently.
Acked-by: Dave Martin <Dave.Martin@arm.com>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/Makefile')
| -rw-r--r-- | arch/arm64/kernel/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 151f28521f1e..a561cbb91d4d 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -29,9 +29,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE obj-$(CONFIG_COMPAT) += sys32.o signal32.o \ sys_compat.o -ifneq ($(CONFIG_COMPAT_VDSO), y) obj-$(CONFIG_COMPAT) += sigreturn32.o -endif obj-$(CONFIG_KUSER_HELPERS) += kuser32.o obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o obj-$(CONFIG_MODULES) += module.o |