Commit 1645f6ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-cleanups-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Miscellaneous x86 cleanups"

* tag 'x86-cleanups-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Move apic_update_irq_cfg() call to apic_update_vector()
  x86/mm: Remove duplicated __PAGE_KERNEL(_EXEC) definitions
parents 56d5e329 7f2b41ac

arch/x86/include/asm/pgtable_types.h

+0 −3
Original line number Diff line number Diff line
@@ -214,9 +214,6 @@ enum page_cache_mode { 
#define PAGE_READONLY	     __pg(__PP|   0|_USR|___A|__NX|   0|   0|   0)

#define PAGE_READONLY_EXEC   __pg(__PP|   0|_USR|___A|   0|   0|   0|   0)



#define __PAGE_KERNEL		 (__PP|__RW|   0|___A|__NX|___D|   0|___G)

#define __PAGE_KERNEL_EXEC	 (__PP|__RW|   0|___A|   0|___D|   0|___G)



/*

 * Page tables needs to have Write=1 in order for any lower PTEs to be

 * writable. This includes shadow stack memory (Write=0, Dirty=1)

arch/x86/kernel/apic/vector.c

+2 −2
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ static void apic_update_vector(struct irq_data *irqd, unsigned int newvec, 
	apicd->cpu = newcpu;

	BUG_ON(!IS_ERR_OR_NULL(per_cpu(vector_irq, newcpu)[newvec]));

	per_cpu(vector_irq, newcpu)[newvec] = desc;

	apic_update_irq_cfg(irqd, newvec, newcpu);

}



static void vector_assign_managed_shutdown(struct irq_data *irqd)
@@ -261,7 +262,6 @@ assign_vector_locked(struct irq_data *irqd, const struct cpumask *dest) 
	if (vector < 0)

		return vector;

	apic_update_vector(irqd, vector, cpu);

	apic_update_irq_cfg(irqd, vector, cpu);



	return 0;

}
@@ -338,7 +338,7 @@ assign_managed_vector(struct irq_data *irqd, const struct cpumask *dest) 
	if (vector < 0)

		return vector;

	apic_update_vector(irqd, vector, cpu);

	apic_update_irq_cfg(irqd, vector, cpu);



	return 0;

}