diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 14:33:48 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 14:33:48 +0900 |
| commit | 8d900e7f3178dccb123c877253bdb193827654c6 (patch) | |
| tree | 062912169e6a8b9cc751621cc0144a38ebe24e1a /arch/parisc | |
| parent | 41abc90228f98774263572ec99e7ab820f091002 (diff) | |
| parent | 4797ec2dc83a43be35bad56037d1b53db9e2b5d5 (diff) | |
| download | op-kernel-dev-8d900e7f3178dccb123c877253bdb193827654c6.zip op-kernel-dev-8d900e7f3178dccb123c877253bdb193827654c6.tar.gz | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull two arm64 fixes from Catalin Marinas:
- arm64 migrate_irqs() fix following commit ffde1de64012 (irqchip: Gic:
Support forced affinity setting)
- fix arm64 pud_huge() to return 0 when only 2 levels page tables are
used (__PAGETABLE_PMD_FOLDED defined and pmd_huge already covers
block entries at the first level), otherwise KVM gets confused
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: fix pud_huge() for 2-level pagetables
arm64: use cpu_online_mask when using forced irq_set_affinity
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions
