1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index a0afa7511a30..631607788f83 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -189,7 +189,7 @@ struct mlx4_buf_list {
 };
 
 struct mlx4_buf {
-        union {
+        struct {
                 struct mlx4_buf_list    direct;
                 struct mlx4_buf_list   *page_list;
         } u;
@@ -310,7 +310,7 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
 void mlx4_buf_free(struct mlx4_dev *dev, int size, struct mlx4_buf *buf);
 static inline void *mlx4_buf_offset(struct mlx4_buf *buf, int offset)
 {
-        if (buf->nbufs == 1)
+        if (BITS_PER_LONG == 64 || buf->nbufs == 1)
                 return buf->u.direct.buf + offset;
         else
                 return buf->u.page_list[offset >> PAGE_SHIFT].buf +