leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

caif: include linux/io.h

Browse Source 
The caif_shmcore requires io.h in order to use ioremap, so include that
explicitly to compile in all configurations.

Also add a note about the use of ioremap(), which is not a proper way
to map a DMA buffer into kernel space. It's not completely clear what
the intention is for using ioremap, but it is clear that the result
of ioremap must not simply be accessed using kernel pointers but
should use readl/writel or memcopy_{to,from}io. Assigning the result
of ioremap to a regular pointer that can also be set to something
else is not ok.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2012-04-20 10:56:11 +00:00 committed by David S. Miller
parent 65f6092517
commit 6e4a76291e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/caif/caif_shmcore.c
View File

@ -13,6 +13,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/io.h>
#include <net/caif/caif_device.h> #include <net/caif/caif_device.h>
#include <net/caif/caif_shm.h> #include <net/caif/caif_shm.h>
@ -647,6 +648,9 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev)
if (pshm_dev->shm_loopback) if (pshm_dev->shm_loopback)
tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr; tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr;
else else
/*
* FIXME: the result of ioremap is not a pointer - arnd
*/
tx_buf->desc_vptr = tx_buf->desc_vptr =
ioremap(tx_buf->phy_addr, TX_BUF_SZ); ioremap(tx_buf->phy_addr, TX_BUF_SZ);