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.

Merge tag 'x86-vdso-2026-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 vdso updates from Ingo Molnar:
"vdso cleanups by Thomas Weißschuh:

- Clean up remnants of VDSO32_NOTE_MASK

- Drop pointless #ifdeffery in vvar_vclock_fault()"

* tag 'x86-vdso-2026-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/vdso: Drop pointless #ifdeffery in vvar_vclock_fault()
x86/vdso: Clean up remnants of VDSO32_NOTE_MASK

Linus Torvalds 49b30f3e 0972ba56

-6
-4
arch/x86/entry/vdso/vma.c
··· 88 88 struct vm_area_struct *vma, struct vm_fault *vmf) 89 89 { 90 90 switch (vmf->pgoff) { 91 - #ifdef CONFIG_PARAVIRT_CLOCK 92 91 case VDSO_PAGE_PVCLOCK_OFFSET: 93 92 { 94 93 struct pvclock_vsyscall_time_info *pvti = ··· 99 100 pgprot_decrypted(vma->vm_page_prot)); 100 101 break; 101 102 } 102 - #endif /* CONFIG_PARAVIRT_CLOCK */ 103 - #ifdef CONFIG_HYPERV_TIMER 104 103 case VDSO_PAGE_HVCLOCK_OFFSET: 105 104 { 106 105 unsigned long pfn = hv_get_tsc_pfn(); ··· 106 109 return vmf_insert_pfn(vma, vmf->address, pfn); 107 110 break; 108 111 } 109 - #endif /* CONFIG_HYPERV_TIMER */ 110 112 } 111 113 112 114 return VM_FAULT_SIGBUS;
-1
arch/x86/include/asm/vdso.h
··· 18 18 unsigned long extable_base, extable_len; 19 19 const void *extable; 20 20 21 - long sym_VDSO32_NOTE_MASK; 22 21 long sym___kernel_sigreturn; 23 22 long sym___kernel_rt_sigreturn; 24 23 long sym___kernel_vsyscall;
-1
arch/x86/tools/vdso2c.c
··· 75 75 }; 76 76 77 77 struct vdso_sym required_syms[] = { 78 - {"VDSO32_NOTE_MASK", true}, 79 78 {"__kernel_vsyscall", true}, 80 79 {"__kernel_sigreturn", true}, 81 80 {"__kernel_rt_sigreturn", true},