diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:36:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:36:49 +0200 |
| commit | 97856e59384de326174360a780038113fea19f42 (patch) | |
| tree | 6b4d9e5fb0e93e0274a7d2626276e5d475824568 /tools/testing/selftests/kvm/lib/kvm_util.c | |
| parent | 40688bd58df71269d146996e10e84ca3888fd330 (diff) | |
| parent | 4f5cafb5cb8471e54afdc9054d973535614f7675 (diff) | |
Merge 5.4-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/kvm/lib/kvm_util.c')
| -rw-r--r-- | tools/testing/selftests/kvm/lib/kvm_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 80a338b5403c..41cf45416060 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -705,7 +705,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, * on error (e.g. currently no memory region using memslot as a KVM * memory slot ID). */ -static struct userspace_mem_region * +struct userspace_mem_region * memslot2region(struct kvm_vm *vm, uint32_t memslot) { struct userspace_mem_region *region; |