svn commit: r238674 - stable/8/sys/dev/sound/pci

[Pedro F. Giffuni]

Author: pfg
Date: Sat Jul 21 19:46:14 2012
New Revision: 238674
URL: http://svn.freebsd.org/changeset/base/238674

Log:
  MFC	233362:
  
  Don't cast a bus address to a uint8_t pointer just to add an offset to
  it.  Instead, add the offset directly to the bus address.
  
  This permits linking emu10k to an i386 PAE kernel.

Modified:
  stable/8/sys/dev/sound/pci/emu10kx.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/sound/   (props changed)
  stable/8/sys/dev/sound/pci/   (props changed)

Modified: stable/8/sys/dev/sound/pci/emu10kx.c
==============================================================================
--- stable/8/sys/dev/sound/pci/emu10kx.c	Sat Jul 21 14:59:43 2012	(r238673)
+++ stable/8/sys/dev/sound/pci/emu10kx.c	Sat Jul 21 19:46:14 2012	(r238674)
@@ -1137,7 +1137,7 @@ emu_memalloc(struct emu_mem *mem, uint32
 	ofs = 0;
 	for (idx = start; idx < start + blksz; idx++) {
 		mem->bmap[idx >> 3] |= 1 << (idx & 7);
-		tmp = (uint32_t) (u_long) ((uint8_t *) blk->buf_addr + ofs);
+		tmp = (uint32_t) (blk->buf_addr + ofs);
 		mem->ptb_pages[idx] = (tmp << 1) | idx;
 		ofs += EMUPAGESIZE;
 	}