Skip to content

Commit c7767f5

Browse files
kevin-brodsky-armwilldeacon
authored andcommitted
arm64: vdso32: Remove unused vdso32-offsets.h
Commit 2d07196 ("arm64: compat: Remove 32-bit sigreturn code from the vDSO") removed all VDSO_* symbols in the compat vDSO. As a result, vdso32-offsets.h is now empty and therefore unused. Time to remove it. Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com> Link: https://lore.kernel.org/r/20240129154748.1727759-1-kevin.brodsky@arm.com Signed-off-by: Will Deacon <will@kernel.org>
1 parent d104a6f commit c7767f5

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

arch/arm64/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ vdso_prepare: prepare0
195195
include/generated/vdso-offsets.h arch/arm64/kernel/vdso/vdso.so
196196
ifdef CONFIG_COMPAT_VDSO
197197
$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 \
198-
include/generated/vdso32-offsets.h arch/arm64/kernel/vdso32/vdso.so
198+
arch/arm64/kernel/vdso32/vdso.so
199199
endif
200200
endif
201201

arch/arm64/include/asm/vdso.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
#ifndef __ASSEMBLY__
1818

1919
#include <generated/vdso-offsets.h>
20-
#ifdef CONFIG_COMPAT_VDSO
21-
#include <generated/vdso32-offsets.h>
22-
#endif
2320

2421
#define VDSO_SYMBOL(base, name) \
2522
({ \

arch/arm64/kernel/vdso32/Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ obj-vdso := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso)
127127
targets += vdso.lds
128128
CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
129129

130-
include/generated/vdso32-offsets.h: $(obj)/vdso32.so.dbg FORCE
131-
$(call if_changed,vdsosym)
132-
133130
# Strip rule for vdso.so
134131
$(obj)/vdso.so: OBJCOPYFLAGS := -S
135132
$(obj)/vdso.so: $(obj)/vdso32.so.dbg FORCE
@@ -166,9 +163,3 @@ quiet_cmd_vdsoas = AS32 $@
166163

167164
quiet_cmd_vdsomunge = MUNGE $@
168165
cmd_vdsomunge = $(obj)/$(munge) $< $@
169-
170-
# Generate vDSO offsets using helper script (borrowed from the 64-bit vDSO)
171-
gen-vdsosym := $(srctree)/$(src)/../vdso/gen_vdso_offsets.sh
172-
quiet_cmd_vdsosym = VDSOSYM $@
173-
# The AArch64 nm should be able to read an AArch32 binary
174-
cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@

0 commit comments

Comments
 (0)