ARM: uapi: Drop PSR_ENDSTATE

The symbol PSR_ENDSTATE is pointless for userspace. Drop it from the
UAPI headers and instead inline it into the only two callers.

As as side-effect, remove a leak of an internal kconfig symbol through
the UAPI headers.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/lkml/d2ad12f2-3d65-4bef-890c-65d78a33d790@app.fastmail.com/
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Thomas Weißschuh 2026-01-14 08:28:14 +01:00 committed by Arnd Bergmann
parent b4171fd0b0
commit 49d7819aa9
4 changed files with 4 additions and 12 deletions

View File

@ -73,7 +73,8 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset,
regs->ARM_cpsr = USR26_MODE; \
if (elf_hwcap & HWCAP_THUMB && pc & 1) \
regs->ARM_cpsr |= PSR_T_BIT; \
regs->ARM_cpsr |= PSR_ENDSTATE; \
if (IS_ENABLED(CONFIG_CPU_ENDIAN_BE8)) \
regs->ARM_cpsr |= PSR_E_BIT; \
regs->ARM_pc = pc & ~1; /* pc */ \
regs->ARM_sp = sp; /* sp */ \
})

View File

@ -102,15 +102,6 @@
#define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
#define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
/*
* Default endianness state
*/
#ifdef CONFIG_CPU_ENDIAN_BE8
#define PSR_ENDSTATE PSR_E_BIT
#else
#define PSR_ENDSTATE 0
#endif
/*
* These are 'magic' values for PTRACE_PEEKUSR that return info about where a
* process is located in memory.

View File

@ -337,7 +337,8 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
return 1;
}
cpsr |= PSR_ENDSTATE;
if (IS_ENABLED(CONFIG_CPU_ENDIAN_BE8))
cpsr |= PSR_E_BIT;
/*
* Maybe we need to deliver a 32-bit signal to a 26-bit task.

View File

@ -70,7 +70,6 @@ configs=$(sed -e '
#
# The format is <file-name>:<CONFIG-option> in each line.
config_leak_ignores="
arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8
arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO
arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT
arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION