diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-07 18:47:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-07 18:47:53 -0700 |
| commit | aec040e29e804b40fa2934ec7a5be9f515f23098 (patch) | |
| tree | c9afca2811091ceab7362a34fb22916fc881be10 /arch/s390/kvm/kvm-s390.c | |
| parent | 8ea656bdc9d3c39e18f2bd5d8ffe0301fde64f72 (diff) | |
| parent | 6c61cfe91be53b444abc1da2dbab14efa77706c0 (diff) | |
| download | linux-aec040e29e804b40fa2934ec7a5be9f515f23098.tar.bz2 | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix kvm defines for 31 bit compile
[S390] use generic RCU page-table freeing code
[S390] qdio: Split SBAL entry flags
[S390] kvm-s390: fix stfle facilities numbers >=64
[S390] kvm-s390: Fix host crash on misbehaving guests
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 30ca85cce314..67345ae7ce8d 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -731,6 +731,7 @@ static int __init kvm_s390_init(void) } memcpy(facilities, S390_lowcore.stfle_fac_list, 16); facilities[0] &= 0xff00fff3f47c0000ULL; + facilities[1] &= 0x201c000000000000ULL; return 0; } |