]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/unwind_user: Simplify unwind_user_word_size()
authorJens Remus <jremus@linux.ibm.com>
Mon, 8 Dec 2025 16:03:52 +0000 (17:03 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 17 Dec 2025 12:31:08 +0000 (13:31 +0100)
Get rid of superfluous ifdef and return explicit word size depending on
32-bit or 64-bit mode.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20251208160352.1363040-5-jremus@linux.ibm.com
arch/x86/include/asm/unwind_user.h

index 7f1229b33d06ca7150b4470b0bb552881270ac95..6e469044e4de0accb69f50e19628d80b220be466 100644 (file)
@@ -12,11 +12,7 @@ static inline int unwind_user_word_size(struct pt_regs *regs)
        /* We can't unwind VM86 stacks */
        if (regs->flags & X86_VM_MASK)
                return 0;
-#ifdef CONFIG_X86_64
-       if (!user_64bit_mode(regs))
-               return sizeof(int);
-#endif
-       return sizeof(long);
+       return user_64bit_mode(regs) ? 8 : 4;
 }
 
 #endif /* CONFIG_UNWIND_USER */