]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/tls: Clean up 'sel' variable usage in do_set_thread_area()
authorUros Bizjak <ubizjak@gmail.com>
Mon, 30 Mar 2026 08:59:23 +0000 (10:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 31 Mar 2026 07:50:11 +0000 (09:50 +0200)
The top-level 'sel' variable in do_set_thread_area() was previously
marked __maybe_unused, but it is now only needed locally when
updating the current task.

Remove the unused top-level declaration and introduce a local 'sel'
variable where it is actually used

No functional change intended.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://patch.msgid.link/20260330085938.67985-4-ubizjak@gmail.com
arch/x86/kernel/tls.c

index 3ffbab0081f45916aaf87ae7e60f78be26a3a034..86b4186a0d4f954bed7203b0f42bde1c5367df9a 100644 (file)
@@ -117,7 +117,7 @@ int do_set_thread_area(struct task_struct *p, int idx,
                       int can_allocate)
 {
        struct user_desc info;
-       unsigned short __maybe_unused sel, modified_sel;
+       unsigned short modified_sel;
 
        if (copy_from_user(&info, u_info, sizeof(info)))
                return -EFAULT;
@@ -153,6 +153,8 @@ int do_set_thread_area(struct task_struct *p, int idx,
        modified_sel = (idx << 3) | 3;
 
        if (p == current) {
+               unsigned short sel;
+
 #ifdef CONFIG_X86_64
                savesegment(ds, sel);
                if (sel == modified_sel)