tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Thomas Weißschuh and committed by
Arnd Bergmann 49d7819a b4171fd0

+4 -12
+2 -1
arch/arm/include/asm/processor.h
··· 73 73 regs->ARM_cpsr = USR26_MODE; \ 74 74 if (elf_hwcap & HWCAP_THUMB && pc & 1) \ 75 75 regs->ARM_cpsr |= PSR_T_BIT; \ 76 - regs->ARM_cpsr |= PSR_ENDSTATE; \ 76 + if (IS_ENABLED(CONFIG_CPU_ENDIAN_BE8)) \ 77 + regs->ARM_cpsr |= PSR_E_BIT; \ 77 78 regs->ARM_pc = pc & ~1; /* pc */ \ 78 79 regs->ARM_sp = sp; /* sp */ \ 79 80 })
-9
arch/arm/include/uapi/asm/ptrace.h
··· 102 102 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */ 103 103 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */ 104 104 105 - /* 106 - * Default endianness state 107 - */ 108 - #ifdef CONFIG_CPU_ENDIAN_BE8 109 - #define PSR_ENDSTATE PSR_E_BIT 110 - #else 111 - #define PSR_ENDSTATE 0 112 - #endif 113 - 114 105 /* 115 106 * These are 'magic' values for PTRACE_PEEKUSR that return info about where a 116 107 * process is located in memory.
+2 -1
arch/arm/kernel/signal.c
··· 337 337 return 1; 338 338 } 339 339 340 - cpsr |= PSR_ENDSTATE; 340 + if (IS_ENABLED(CONFIG_CPU_ENDIAN_BE8)) 341 + cpsr |= PSR_E_BIT; 341 342 342 343 /* 343 344 * Maybe we need to deliver a 32-bit signal to a 26-bit task.
-1
scripts/headers_install.sh
··· 70 70 # 71 71 # The format is <file-name>:<CONFIG-option> in each line. 72 72 config_leak_ignores=" 73 - arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8 74 73 arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO 75 74 arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT 76 75 arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION