- fix-compiler-warning-in-drivers-media-video-video-bufc.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     fix compiler warning in drivers/media/video/video-buf.c

has been removed from the -mm tree.  Its filename is

     fix-compiler-warning-in-drivers-media-video-video-bufc.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: fix compiler warning in drivers/media/video/video-buf.c
From: Sujoy Gupta <sujoy@xxxxxxxxxx>

Using a double cast to avoid compiler warnings when building for PAE. 
Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer.

Signed-off-by: Martin J. Bligh <mbligh@xxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/media/video/video-buf.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -puN drivers/media/video/video-buf.c~fix-compiler-warning-in-drivers-media-video-video-bufc drivers/media/video/video-buf.c
--- a/drivers/media/video/video-buf.c~fix-compiler-warning-in-drivers-media-video-video-bufc
+++ a/drivers/media/video/video-buf.c
@@ -365,7 +365,12 @@ videobuf_iolock(struct videobuf_queue* q
 		if (NULL == fbuf)
 			return -EINVAL;
 		/* FIXME: need sanity checks for vb->boff */
-		bus   = (dma_addr_t)fbuf->base + vb->boff;
+		/*
+		 * Using a double cast to avoid compiler warnings when
+		 * building for PAE. Compiler doesn't like direct casting
+		 * of a 32 bit ptr to 64 bit integer.
+		 */
+		bus   = (dma_addr_t)(unsigned long)fbuf->base + vb->boff;
 		pages = PAGE_ALIGN(vb->size) >> PAGE_SHIFT;
 		err = videobuf_dma_init_overlay(&vb->dma,PCI_DMA_FROMDEVICE,
 						bus, pages);
_

Patches currently in -mm which might be from sujoy@xxxxxxxxxx are

git-dvb.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux