Commit 49b30f3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0972ba56 6ccd0843

arch/x86/entry/vdso/vma.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

arch/x86/include/asm/vdso.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ struct vdso_image { 
	unsigned long extable_base, extable_len;

	const void *extable;



	long sym_VDSO32_NOTE_MASK;

	long sym___kernel_sigreturn;

	long sym___kernel_rt_sigreturn;

	long sym___kernel_vsyscall;

arch/x86/tools/vdso2c.c

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ struct vdso_sym { 
};



struct vdso_sym required_syms[] = {

	{"VDSO32_NOTE_MASK", true},

	{"__kernel_vsyscall", true},

	{"__kernel_sigreturn", true},

	{"__kernel_rt_sigreturn", true},