Commit c7767f5c authored by Kevin Brodsky's avatar Kevin Brodsky Committed by Will Deacon
Browse files

arm64: vdso32: Remove unused vdso32-offsets.h 



Commit 2d071968 ("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: default avatarKevin Brodsky <kevin.brodsky@arm.com>
Link: https://lore.kernel.org/r/20240129154748.1727759-1-kevin.brodsky@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent d104a6fe

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ vdso_prepare: prepare0 
	include/generated/vdso-offsets.h arch/arm64/kernel/vdso/vdso.so

ifdef CONFIG_COMPAT_VDSO

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 \

	include/generated/vdso32-offsets.h arch/arm64/kernel/vdso32/vdso.so

	arch/arm64/kernel/vdso32/vdso.so

endif

endif

arch/arm64/include/asm/vdso.h

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
#ifndef __ASSEMBLY__



#include <generated/vdso-offsets.h>

#ifdef CONFIG_COMPAT_VDSO

#include <generated/vdso32-offsets.h>

#endif



#define VDSO_SYMBOL(base, name)						   \

({									   \

arch/arm64/kernel/vdso32/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -127,9 +127,6 @@ obj-vdso := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso) 
targets += vdso.lds

CPPFLAGS_vdso.lds += -P -C -U$(ARCH)



include/generated/vdso32-offsets.h: $(obj)/vdso32.so.dbg FORCE

	$(call if_changed,vdsosym)



# Strip rule for vdso.so

$(obj)/vdso.so: OBJCOPYFLAGS := -S

$(obj)/vdso.so: $(obj)/vdso32.so.dbg FORCE
@@ -166,9 +163,3 @@ quiet_cmd_vdsoas = AS32 $@ 


quiet_cmd_vdsomunge = MUNGE   $@

      cmd_vdsomunge = $(obj)/$(munge) $< $@
 


# Generate vDSO offsets using helper script (borrowed from the 64-bit vDSO)

gen-vdsosym := $(srctree)/$(src)/../vdso/gen_vdso_offsets.sh

quiet_cmd_vdsosym = VDSOSYM $@

# The AArch64 nm should be able to read an AArch32 binary

      cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@