[PATCH] x86/vdso: Drop pointless ifdeffery in vvar_vclock_fault()
From: Thomas Weißschuh
Date: Fri Feb 27 2026 - 01:48:39 EST
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.
Reported-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Closes: https://lore.kernel.org/lkml/20260117215542.405790227@xxxxxxxxxx/
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
---
The other patch from the linked series will be handled in another series.
---
arch/x86/entry/vdso/vma.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
index e7fd7517370f..a6bfcc8243cd 100644
--- a/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@ -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;
---
base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f
change-id: 20260212-vdso-x86-ifdef-7f46624aad8b
Best regards,
--
Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>