diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-26 16:28:36 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-26 16:28:36 +0100 |
| commit | b8bc3bde9c8c90500c648627d53f846642ff8639 (patch) | |
| tree | 0c3ed82848a25948206556bc699a10d30bd18d07 /arch/s390/mm/maccess.c | |
| parent | 171b5682aa8597174e80ec4128c87538103f2213 (diff) | |
| parent | 9abc2a08a7d665b02bdde974fd6c44aae86e923e (diff) | |
| download | linux-b8bc3bde9c8c90500c648627d53f846642ff8639.tar.gz linux-b8bc3bde9c8c90500c648627d53f846642ff8639.tar.bz2 linux-b8bc3bde9c8c90500c648627d53f846642ff8639.zip | |
Merge tag 'kvm-s390-master-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fixes for kvm/master (targeting 4.5)
1. Fallout of some bigger floating point/vector rework in s390
- memory leak -> stable 4.3+
- memory overwrite -> stable 4.4+
2. enable KVM-VFIO for s390
Diffstat (limited to 'arch/s390/mm/maccess.c')
| -rw-r--r-- | arch/s390/mm/maccess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c index 8a993a53fcd6..fec59c067d0d 100644 --- a/arch/s390/mm/maccess.c +++ b/arch/s390/mm/maccess.c @@ -163,11 +163,11 @@ static int is_swapped(unsigned long addr) unsigned long lc; int cpu; - if (addr < sizeof(struct _lowcore)) + if (addr < sizeof(struct lowcore)) return 1; for_each_online_cpu(cpu) { lc = (unsigned long) lowcore_ptr[cpu]; - if (addr > lc + sizeof(struct _lowcore) - 1 || addr < lc) + if (addr > lc + sizeof(struct lowcore) - 1 || addr < lc) continue; return 1; } |