github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Miscellaneous x86 cleanups.

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmiIcXkRHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1ipQBAAhDNnPuEuP1KG1+TptXg2rLfacKBHM2wL
 f3vrx0p5nLj+LwwRvCazdIX9yOw/VEIVzXoRcjeoWTn4JvzCIjYA+E8uCtU+wBOs
 tLrbTOpPPctSxZf3TlKhv3BgXKKtkZ1BCmdd5sxdOgFTdBghHJ3GsC2WgzVm/6aP
 GOl/T0mXYLoEaIbJpXYLRUvSdhTmkprIBR9pi2mTPhui+KcYEuF5gKr+B0dHnOKs
 v59Be+sktuROJJa4Zmm0CyABf9s+Ho3k7sXM5BtaA62RLqLcXGDxzH4zF2rass4z
 IRYy1mhJZRzlu7P3PpMy7fb5wYvwpyFqq+gK7eUuxLvDlmxctriwL1kIzibzZn+8
 4T57rhOtxEQujVSwVrTYaX4E7czjWLHedIeXmcAoV+rwUqYBPkADPq9ad+pzc/wy
 DPEb11HF5VxBpKzvTn+RbfJhl9XRJoSuLSaBgIXrCyBjNhc69JDYe6ZP6jCjHbz0
 yrFn/QuI4cTv66Ig9b9tzQxKk5BKXyqFtj2l+L22zamYKBCiQWTpczhlqmbOZ6Bw
 2hJU1l/8yHt70zZAsfmjDFB8ycJsKegDATJWkVDMme6Z071z8wPElOEso3VlayJg
 Y84gKs83W+2tSGa2aq2Mv5ZRRnEnum9NM6dW8RfOZRSWtfLOniJj1qoXQwSJc2n/
 keahYvCNef4=
 =C/ds
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-07-29 19:00:35 -07:00
commit 1645f6ab96
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/pgtable_types.h
View File

@ -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)

4
arch/x86/kernel/apic/vector.c
View File

@ -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;
}