Merge tag 'metag-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag (065d80b4) · Commits · 戴 / test

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

Documentation/features/vm/THP/arch-support.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		\| ia64: \| TODO \|
		\| m32r: \| .. \|
		\| m68k: \| .. \|
		\| metag: \| .. \|
		\| metag: \| TODO \|
		\| microblaze: \| .. \|
		\| mips: \| ok \|
		\| mn10300: \| .. \|

arch/metag/kernel/irq.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -270,23 +270,25 @@ void migrate_irqs(void)

		for_each_active_irq(i) {
		struct irq_data *data = irq_get_irq_data(i);
		struct cpumask *mask;
		unsigned int newcpu;

		if (irqd_is_per_cpu(data))
		continue;

		if (!cpumask_test_cpu(cpu, data->affinity))
		mask = irq_data_get_affinity_mask(data);
		if (!cpumask_test_cpu(cpu, mask))
		continue;

		newcpu = cpumask_any_and(data->affinity, cpu_online_mask);
		newcpu = cpumask_any_and(mask, cpu_online_mask);

		if (newcpu >= nr_cpu_ids) {
		pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
		i, cpu);

		cpumask_setall(data->affinity);
		cpumask_setall(mask);
		}
		irq_set_affinity(i, data->affinity);
		irq_set_affinity(i, mask);
		}
		}
		#endif /* CONFIG_HOTPLUG_CPU */

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		\| ia64: \| TODO \|
		\| m32r: \| .. \|
		\| m68k: \| .. \|
		\| metag: \| .. \|
		\| metag: \| TODO \|
		\| microblaze: \| .. \|
		\| mips: \| ok \|
		\| mn10300: \| .. \|

Admin message