mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
um: virt-pci: Fix 32-bit compile
There were a few 32-bit compile warnings that of course
turned into errors with -Werror, fix the 32-bit build.
Fixes: 68f5d3f3b6
("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>
This commit is contained in:
parent
4b86366fdf
commit
d73820df64
@ -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 */
|
/* buf->data is maximum size - we may only use parts of it */
|
||||||
struct um_pci_message_buffer *buf;
|
struct um_pci_message_buffer *buf;
|
||||||
u8 *data;
|
u8 *data;
|
||||||
unsigned long ret = ~0ULL;
|
unsigned long ret = ULONG_MAX;
|
||||||
|
|
||||||
if (!dev)
|
if (!dev)
|
||||||
return ~0ULL;
|
return ULONG_MAX;
|
||||||
|
|
||||||
buf = get_cpu_var(um_pci_msg_bufs);
|
buf = get_cpu_var(um_pci_msg_bufs);
|
||||||
data = buf->data;
|
data = buf->data;
|
||||||
|
|
||||||
memset(data, 0xff, sizeof(data));
|
memset(buf->data, 0xff, sizeof(buf->data));
|
||||||
|
|
||||||
switch (size) {
|
switch (size) {
|
||||||
case 1:
|
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 */
|
/* buf->data is maximum size - we may only use parts of it */
|
||||||
struct um_pci_message_buffer *buf;
|
struct um_pci_message_buffer *buf;
|
||||||
u8 *data;
|
u8 *data;
|
||||||
unsigned long ret = ~0ULL;
|
unsigned long ret = ULONG_MAX;
|
||||||
|
|
||||||
buf = get_cpu_var(um_pci_msg_bufs);
|
buf = get_cpu_var(um_pci_msg_bufs);
|
||||||
data = buf->data;
|
data = buf->data;
|
||||||
|
Loading…
Reference in New Issue
Block a user