xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2015-09-09 10:27:59 -07:00
parent 949feacb8a e7e98d7677
commit 065d80b4bf
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/features/vm/THP/arch-support.txt
View File

@@ -20,7 +20,7 @@
| ia64: | TODO | | ia64: | TODO |
| m32r: | .. | | m32r: | .. |
| m68k: | .. | | m68k: | .. |
| metag: | .. | | metag: | TODO |
| microblaze: | .. | | microblaze: | .. |
| mips: | ok | | mips: | ok |
| mn10300: | .. | | mn10300: | .. |

10
arch/metag/kernel/irq.c
View File

@@ -270,23 +270,25 @@ void migrate_irqs(void)
for_each_active_irq(i) { for_each_active_irq(i) {
struct irq_data *data = irq_get_irq_data(i); struct irq_data *data = irq_get_irq_data(i);
struct cpumask *mask;
unsigned int newcpu; unsigned int newcpu;
if (irqd_is_per_cpu(data)) if (irqd_is_per_cpu(data))
continue; continue;
if (!cpumask_test_cpu(cpu, data->affinity)) mask = irq_data_get_affinity_mask(data);
if (!cpumask_test_cpu(cpu, mask))
continue; continue;
newcpu = cpumask_any_and(data->affinity, cpu_online_mask); newcpu = cpumask_any_and(mask, cpu_online_mask);
if (newcpu >= nr_cpu_ids) { if (newcpu >= nr_cpu_ids) {
pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n", pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
i, cpu); i, cpu);
cpumask_setall(data->affinity); cpumask_setall(mask);
} }
irq_set_affinity(i, data->affinity); irq_set_affinity(i, mask);
} }
} }
#endif /* CONFIG_HOTPLUG_CPU */ #endif /* CONFIG_HOTPLUG_CPU */