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

Merge tag 'kvmarm-fixes-for-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/arm fixes for 4.19, take #2

- Correctly order GICv3 SGI registers in the cp15 array

Paolo Bonzini 4cebf459 853c1109

+4 -4
unified split
+4 -4
arch/arm/kvm/coproc.c
··· 478 479 /* ICC_SGI1R */ 480 { CRm64(12), Op1( 0), is64, access_gic_sgi}, 481 - /* ICC_ASGI1R */ 482 - { CRm64(12), Op1( 1), is64, access_gic_sgi}, 483 - /* ICC_SGI0R */ 484 - { CRm64(12), Op1( 2), is64, access_gic_sgi}, 485 486 /* VBAR: swapped by interrupt.S. */ 487 { CRn(12), CRm( 0), Op1( 0), Op2( 0), is32, 488 NULL, reset_val, c12_VBAR, 0x00000000 }, 489 490 /* ICC_SRE */ 491 { CRn(12), CRm(12), Op1( 0), Op2(5), is32, access_gic_sre }, 492
··· 478 479 /* ICC_SGI1R */ 480 { CRm64(12), Op1( 0), is64, access_gic_sgi}, 481 482 /* VBAR: swapped by interrupt.S. */ 483 { CRn(12), CRm( 0), Op1( 0), Op2( 0), is32, 484 NULL, reset_val, c12_VBAR, 0x00000000 }, 485 486 + /* ICC_ASGI1R */ 487 + { CRm64(12), Op1( 1), is64, access_gic_sgi}, 488 + /* ICC_SGI0R */ 489 + { CRm64(12), Op1( 2), is64, access_gic_sgi}, 490 /* ICC_SRE */ 491 { CRn(12), CRm(12), Op1( 0), Op2(5), is32, access_gic_sre }, 492