[PATCH 15/30] staging/vme_user: remove __iomem marking from kern_buf and derivates

Martyn Welch martyn.welch at ge.com
Wed Oct 27 12:20:03 UTC 2010


On 26/10/10 02:11, Emilio G. Cota wrote:
> From: Emilio G. Cota <cota at braap.org>
> 
> kern_buf is not iomem; it comes from kmalloc and is directly
> dereferenced.
> 
> Signed-off-by: Emilio G. Cota <cota at braap.org>

Acked-by: Martyn Welch <martyn.welch at ge.com>

> ---
>  drivers/staging/vme/devices/vme_user.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
> index e7669a4..ead30d2 100644
> --- a/drivers/staging/vme/devices/vme_user.c
> +++ b/drivers/staging/vme/devices/vme_user.c
> @@ -92,7 +92,7 @@ static unsigned int bus_num;
>   * Structure to handle image related parameters.
>   */
>  typedef struct {
> -	void __iomem *kern_buf;	/* Buffer address in kernel space */
> +	void *kern_buf;	/* Buffer address in kernel space */
>  	dma_addr_t pci_buf;	/* Buffer address in PCI address space */
>  	unsigned long long size_buf;	/* Buffer size */
>  	struct semaphore sem;	/* Semaphore for locking image */
> @@ -277,7 +277,7 @@ static ssize_t resource_from_user(unsigned int minor, const char *buf,
>  static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
>  	size_t count, loff_t *ppos)
>  {
> -	void __iomem *image_ptr;
> +	void *image_ptr;
>  	ssize_t retval;
>  
>  	image_ptr = image[minor].kern_buf + *ppos;
> @@ -296,7 +296,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
>  static ssize_t buffer_from_user(unsigned int minor, const char *buf,
>  	size_t count, loff_t *ppos)
>  {
> -	void __iomem *image_ptr;
> +	void *image_ptr;
>  	size_t retval;
>  
>  	image_ptr = image[minor].kern_buf + *ppos;


-- 
Martyn Welch (Principal Software Engineer)   |   Registered in England and
GE Intelligent Platforms                     |   Wales (3828642) at 100
T +44(0)127322748                            |   Barbirolli Square,
Manchester,
E martyn.welch at ge.com                        |   M2 3AB  VAT:GB 927559189



More information about the devel mailing list