um: virt-pci: Fix 32-bit compile

[ Upstream commit d73820df6437b5d0a57be53faf39db46a0264b3a ]

There were a few 32-bit compile warnings that of course
turned into errors with -Werror, fix the 32-bit build.

Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c
index c0806663302349eb4398de2a879650d65fd03667..0ab58016db22fe97d3da6b25d4a11133d7013fa2 100644 (file)
--- a/arch/um/drivers/virt-pci.c
+++ b/arch/um/drivers/virt-pci.c
@@ -181,15 +181,15 @@ static unsigned long um_pci_cfgspace_read(void *priv, unsigned int offset,
        /* buf->data is maximum size - we may only use parts of it */
        struct um_pci_message_buffer *buf;
        u8 *data;
-       unsigned long ret = ~0ULL;
+       unsigned long ret = ULONG_MAX;
 
        if (!dev)
-               return ~0ULL;
+               return ULONG_MAX;
 
        buf = get_cpu_var(um_pci_msg_bufs);
        data = buf->data;
 
-       memset(data, 0xff, sizeof(data));
+       memset(buf->data, 0xff, sizeof(buf->data));
 
        switch (size) {
        case 1:
@@ -304,7 +304,7 @@ static unsigned long um_pci_bar_read(void *priv, unsigned int offset,
        /* buf->data is maximum size - we may only use parts of it */
        struct um_pci_message_buffer *buf;
        u8 *data;
-       unsigned long ret = ~0ULL;
+       unsigned long ret = ULONG_MAX;
 
        buf = get_cpu_var(um_pci_msg_bufs);
        data = buf->data;