]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/vdso: Drop pointless #ifdeffery in vvar_vclock_fault()
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>
Tue, 31 Mar 2026 07:58:54 +0000 (09:58 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 31 Mar 2026 08:06:39 +0000 (10:06 +0200)
Sparse complains rightfully when CONFIG_PARAVIRT_CLOCK and
CONFIG_HYPERV_TIMER are both not set:

  arch/x86/entry/vdso/vma.c:94:9: warning: switch with no cases

The #ifdeffery is not actually necessary as the compiler can optimize away
the branches already if these config options are not set.

Remove the #ifdeffery to make the code simpler and Sparse happy.

Closes: https://lore.kernel.org/lkml/20260117215542.405790227@kernel.org/
Reported-by: Thomas Gleixner <tglx@kernel.org>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Andy Lutomirski <luto@kernel.org>
Link: https://patch.msgid.link/20260331-vdso-x86-ifdef-v1-1-6be9a58b1e7e@linutronix.de
arch/x86/entry/vdso/vma.c

index e7fd7517370f7cda1b9150b590a43e4c40e9de53..a6bfcc8243cd91cc5b0547d74dd42c97835a90b8 100644 (file)
@@ -88,7 +88,6 @@ static vm_fault_t vvar_vclock_fault(const struct vm_special_mapping *sm,
                                    struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        switch (vmf->pgoff) {
-#ifdef CONFIG_PARAVIRT_CLOCK
        case VDSO_PAGE_PVCLOCK_OFFSET:
        {
                struct pvclock_vsyscall_time_info *pvti =
@@ -100,8 +99,6 @@ static vm_fault_t vvar_vclock_fault(const struct vm_special_mapping *sm,
                                        pgprot_decrypted(vma->vm_page_prot));
                break;
        }
-#endif /* CONFIG_PARAVIRT_CLOCK */
-#ifdef CONFIG_HYPERV_TIMER
        case VDSO_PAGE_HVCLOCK_OFFSET:
        {
                unsigned long pfn = hv_get_tsc_pfn();
@@ -109,7 +106,6 @@ static vm_fault_t vvar_vclock_fault(const struct vm_special_mapping *sm,
                        return vmf_insert_pfn(vma, vmf->address, pfn);
                break;
        }
-#endif /* CONFIG_HYPERV_TIMER */
        }
 
        return VM_FAULT_SIGBUS;