diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-20 12:56:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-21 21:28:47 +0200 |
| commit | 6e4a76291ebd5c61dcaa8281cefe0bd2d883c1fd (patch) | |
| tree | b0628ffa8ade84bc0d82efe47536a161c44af697 | |
| parent | drivers/net: add missing __devexit_p() annotations (diff) | |
| download | linux-6e4a76291ebd5c61dcaa8281cefe0bd2d883c1fd.tar.xz linux-6e4a76291ebd5c61dcaa8281cefe0bd2d883c1fd.zip | |
caif: include linux/io.h
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>
| -rw-r--r-- | drivers/net/caif/caif_shmcore.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c index 5b2041319a32..bc497d718858 100644 --- a/drivers/net/caif/caif_shmcore.c +++ b/drivers/net/caif/caif_shmcore.c @@ -13,6 +13,7 @@ #include <linux/list.h> #include <linux/netdevice.h> #include <linux/if_arp.h> +#include <linux/io.h> #include <net/caif/caif_device.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) tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr; else + /* + * FIXME: the result of ioremap is not a pointer - arnd + */ tx_buf->desc_vptr = ioremap(tx_buf->phy_addr, TX_BUF_SZ); |