Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'metag-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Pull metag updates from James Hogan:
"Metag architecture changes for v4.3.

Just a couple of changes for v4.3-rc1. A preparatory IRQ patch to
prepare for moving irq_data struct members, and a tweak to
Documentation/features since Meta2 could support THP"

* tag 'metag-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
Documentation/features/vm: Meta2 is capable of THP
metag/irq: Use access helper irq_data_get_affinity_mask()

+7 -5
+1 -1
Documentation/features/vm/THP/arch-support.txt
··· 20 20 | ia64: | TODO | 21 21 | m32r: | .. | 22 22 | m68k: | .. | 23 - | metag: | .. | 23 + | metag: | TODO | 24 24 | microblaze: | .. | 25 25 | mips: | ok | 26 26 | mn10300: | .. |
+6 -4
arch/metag/kernel/irq.c
··· 270 270 271 271 for_each_active_irq(i) { 272 272 struct irq_data *data = irq_get_irq_data(i); 273 + struct cpumask *mask; 273 274 unsigned int newcpu; 274 275 275 276 if (irqd_is_per_cpu(data)) 276 277 continue; 277 278 278 - if (!cpumask_test_cpu(cpu, data->affinity)) 279 + mask = irq_data_get_affinity_mask(data); 280 + if (!cpumask_test_cpu(cpu, mask)) 279 281 continue; 280 282 281 - newcpu = cpumask_any_and(data->affinity, cpu_online_mask); 283 + newcpu = cpumask_any_and(mask, cpu_online_mask); 282 284 283 285 if (newcpu >= nr_cpu_ids) { 284 286 pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n", 285 287 i, cpu); 286 288 287 - cpumask_setall(data->affinity); 289 + cpumask_setall(mask); 288 290 } 289 - irq_set_affinity(i, data->affinity); 291 + irq_set_affinity(i, mask); 290 292 } 291 293 } 292 294 #endif /* CONFIG_HOTPLUG_CPU */