> Avoid using memory block ids. While at it, use uint64_t for > address/size. > > Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxx> > Cc: Jason Wang <jasowang@xxxxxxxxxx> > Cc: Pankaj Gupta <pankaj.gupta.linux@xxxxxxxxx> > Signed-off-by: David Hildenbrand <david@xxxxxxxxxx> > --- > drivers/virtio/virtio_mem.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c > index 821143db14fe..37a0e338ae4a 100644 > --- a/drivers/virtio/virtio_mem.c > +++ b/drivers/virtio/virtio_mem.c > @@ -489,14 +489,10 @@ static int virtio_mem_translate_node_id(struct virtio_mem *vm, uint16_t node_id) > * Test if a virtio-mem device overlaps with the given range. Can be called > * from (notifier) callbacks lockless. > */ > -static bool virtio_mem_overlaps_range(struct virtio_mem *vm, > - unsigned long start, unsigned long size) > +static bool virtio_mem_overlaps_range(struct virtio_mem *vm, uint64_t start, > + uint64_t size) > { > - unsigned long dev_start = virtio_mem_mb_id_to_phys(vm->first_mb_id); > - unsigned long dev_end = virtio_mem_mb_id_to_phys(vm->last_mb_id) + > - memory_block_size_bytes(); > - > - return start < dev_end && dev_start < start + size; > + return start < vm->addr + vm->region_size && vm->addr < start + size; > } Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@xxxxxxxxx>