Skip to content

Commit 1645f6a

Browse files
committed
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
2 parents 56d5e32 + 7f2b41a commit 1645f6a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

arch/x86/include/asm/pgtable_types.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,6 @@ enum page_cache_mode {
214214
#define PAGE_READONLY __pg(__PP| 0|_USR|___A|__NX| 0| 0| 0)
215215
#define PAGE_READONLY_EXEC __pg(__PP| 0|_USR|___A| 0| 0| 0| 0)
216216

217-
#define __PAGE_KERNEL (__PP|__RW| 0|___A|__NX|___D| 0|___G)
218-
#define __PAGE_KERNEL_EXEC (__PP|__RW| 0|___A| 0|___D| 0|___G)
219-
220217
/*
221218
* Page tables needs to have Write=1 in order for any lower PTEs to be
222219
* writable. This includes shadow stack memory (Write=0, Dirty=1)

arch/x86/kernel/apic/vector.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ static void apic_update_vector(struct irq_data *irqd, unsigned int newvec,
183183
apicd->cpu = newcpu;
184184
BUG_ON(!IS_ERR_OR_NULL(per_cpu(vector_irq, newcpu)[newvec]));
185185
per_cpu(vector_irq, newcpu)[newvec] = desc;
186+
apic_update_irq_cfg(irqd, newvec, newcpu);
186187
}
187188

188189
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)
261262
if (vector < 0)
262263
return vector;
263264
apic_update_vector(irqd, vector, cpu);
264-
apic_update_irq_cfg(irqd, vector, cpu);
265265

266266
return 0;
267267
}
@@ -338,7 +338,7 @@ assign_managed_vector(struct irq_data *irqd, const struct cpumask *dest)
338338
if (vector < 0)
339339
return vector;
340340
apic_update_vector(irqd, vector, cpu);
341-
apic_update_irq_cfg(irqd, vector, cpu);
341+
342342
return 0;
343343
}
344344

0 commit comments

Comments
 (0)