[Compile Regression in 2.4.25-pre8][PATCH 34/42]

Kronos
2004-02-02T20:39:13Z

r128_cce.c:357: warning: unsigned int format, different type arg (arg 3)
radeon_cp.c:908: warning: unsigned int format, different type arg (arg 3)

dma_addr_t can be 64 bit long even on x86 (when CONFIG_HIGHMEM64G is
defined). Cast to dma64_addr_t in the printk.

diff -Nru -X dontdiff linux-2.4-vanilla/drivers/char/drm/r128_cce.c linux-2.4/drivers/char/drm/r128_cce.c
--- linux-2.4-vanilla/drivers/char/drm/r128_cce.c Sat Jan 31 15:54:42 2004
+++ linux-2.4/drivers/char/drm/r128_cce.c Sat Jan 31 18:59:21 2004
@@ -352,8 +352,8 @@

R128_WRITE( R128_PM4_BUFFER_DL_RPTR_ADDR,
entry->busaddr[page_ofs]);
- DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
- entry->busaddr[page_ofs],
+ DRM_DEBUG( "ring rptr: offset=0x%08Lx handle=0x%08lx\n",
+ (dma64_addr_t)entry->busaddr[page_ofs],
entry->handle + tmp_ofs );
}

diff -Nru -X dontdiff linux-2.4-vanilla/drivers/char/drm/radeon_cp.c linux-2.4/drivers/char/drm/radeon_cp.c
--- linux-2.4-vanilla/drivers/char/drm/radeon_cp.c Sat Jan 31 15:54:42 2004
+++ linux-2.4/drivers/char/drm/radeon_cp.c Sat Jan 31 19:00:12 2004
@@ -903,8 +903,8 @@

RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
entry->busaddr[page_ofs]);
- DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
- entry->busaddr[page_ofs],
+ DRM_DEBUG( "ring rptr: offset=0x%08Lx handle=0x%08lx\n",
+ (dma64_addr_t)entry->busaddr[page_ofs],
entry->handle + tmp_ofs );
}

--
Reply-To: kronos@kronoz.cjb.net
Home: http://kronoz.cjb.net
Carpe diem, quam minimum credula postero. (Q. Horatius Flaccus)