Skip to content

Commit 68c5cf5

Browse files
James HoganMartin Schwidefsky
authored andcommitted
s390: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
AT_VECTOR_SIZE_ARCH should be defined with the maximum number of NEW_AUX_ENT entries that ARCH_DLINFO can contain, but it wasn't defined for s390 at all even though ARCH_DLINFO can contain one NEW_AUX_ENT when VDSO is enabled. This shouldn't be a problem as AT_VECTOR_SIZE_BASE includes space for AT_BASE_PLATFORM which s390 doesn't use, but lets define it now and add the comment above ARCH_DLINFO as found in several other architectures to remind future modifiers of ARCH_DLINFO to keep AT_VECTOR_SIZE_ARCH up to date. Fixes: b020632 ("[S390] introduce vdso on s390") Signed-off-by: James Hogan <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: [email protected]
1 parent 33c388b commit 68c5cf5

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

arch/s390/include/asm/elf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ do { \
225225
#define MMAP_ALIGN_MASK (is_compat_task() ? 0 : 0x7fUL)
226226
#define STACK_RND_MASK MMAP_RND_MASK
227227

228+
/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */
228229
#define ARCH_DLINFO \
229230
do { \
230231
if (vdso_enabled) \

arch/s390/include/uapi/asm/auxvec.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33

44
#define AT_SYSINFO_EHDR 33
55

6+
#define AT_VECTOR_SIZE_ARCH 1 /* entries in ARCH_DLINFO */
7+
68
#endif

0 commit comments

Comments
 (0)