svn commit: r335293 - stable/11/sys/dev/liquidio

[Dimitry Andric]

Author: dim
Date: Sun Jun 17 17:38:24 2018
New Revision: 335293
URL: https://svnweb.freebsd.org/changeset/base/335293

Log:
  MFC r335034:
  
  Fix build of liquidio with base gcc on i386
  
  Some casts from pointers to uint64_t and back in lio_main.c cause base
  gcc on i386 to warn "cast from pointer to integer of different size",
  and vice versa.  Add additional casts to uintptr_t to suppress these.
  
  Reviewed by:	sbruno
  Differential Revision: https://reviews.freebsd.org/D15754

Modified:
  stable/11/sys/dev/liquidio/lio_main.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/liquidio/lio_main.c
==============================================================================
--- stable/11/sys/dev/liquidio/lio_main.c	Sun Jun 17 17:35:30 2018	(r335292)
+++ stable/11/sys/dev/liquidio/lio_main.c	Sun Jun 17 17:38:24 2018	(r335293)
@@ -1770,8 +1770,8 @@ lio_setup_glists(struct octeon_device *oct, struct lio
 			if (g == NULL)
 				break;
 
-			g->sg = (struct lio_sg_entry *)
-			    ((uint64_t)lio->glists_virt_base[i] +
+			g->sg = (struct lio_sg_entry *)(uintptr_t)
+			    ((uint64_t)(uintptr_t)lio->glists_virt_base[i] +
 			     (j * lio->glist_entry_size));
 			g->sg_dma_ptr = (uint64_t)lio->glists_dma_base[i] +
 				(j * lio->glist_entry_size);