From owner-svn-src-stable-8@FreeBSD.ORG  Sat Jul 21 19:46:14 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D0FB3106564A;
	Sat, 21 Jul 2012 19:46:14 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BA5068FC08;
	Sat, 21 Jul 2012 19:46:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6LJkEJg076780;
	Sat, 21 Jul 2012 19:46:14 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6LJkEwi076778;
	Sat, 21 Jul 2012 19:46:14 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201207211946.q6LJkEwi076778@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sat, 21 Jul 2012 19:46:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238674 - stable/8/sys/dev/sound/pci
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jul 2012 19:46:14 -0000

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;
 	}