Commit b7d78f29 authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] Add volatile to IO pinters

ALSA Core
Add volatile prefix to IO pointers for copy_to_user_fromio() and
copy_from_user_toio() functions.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent eeba0c7d
...@@ -307,8 +307,8 @@ void snd_hidden_vfree(void *obj); ...@@ -307,8 +307,8 @@ void snd_hidden_vfree(void *obj);
#define vfree_nocheck(obj) vfree(obj) #define vfree_nocheck(obj) vfree(obj)
#endif #endif
char *snd_kmalloc_strdup(const char *string, int flags); char *snd_kmalloc_strdup(const char *string, int flags);
int copy_to_user_fromio(void __user *dst, const void __iomem *src, size_t count); int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
int copy_from_user_toio(void __iomem *dst, const void __user *src, size_t count); int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);
/* init.c */ /* init.c */
......
...@@ -253,7 +253,7 @@ char *snd_kmalloc_strdup(const char *string, int flags) ...@@ -253,7 +253,7 @@ char *snd_kmalloc_strdup(const char *string, int flags)
* *
* Returns zero if successful, or non-zero on failure. * Returns zero if successful, or non-zero on failure.
*/ */
int copy_to_user_fromio(void __user *dst, const void __iomem *src, size_t count) int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count)
{ {
#if defined(__i386__) || defined(CONFIG_SPARC32) #if defined(__i386__) || defined(CONFIG_SPARC32)
return copy_to_user(dst, (const void*)src, count) ? -EFAULT : 0; return copy_to_user(dst, (const void*)src, count) ? -EFAULT : 0;
...@@ -284,7 +284,7 @@ int copy_to_user_fromio(void __user *dst, const void __iomem *src, size_t count) ...@@ -284,7 +284,7 @@ int copy_to_user_fromio(void __user *dst, const void __iomem *src, size_t count)
* *
* Returns zero if successful, or non-zero on failure. * Returns zero if successful, or non-zero on failure.
*/ */
int copy_from_user_toio(void __iomem *dst, const void __user *src, size_t count) int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count)
{ {
#if defined(__i386__) || defined(CONFIG_SPARC32) #if defined(__i386__) || defined(CONFIG_SPARC32)
return copy_from_user((void*)dst, src, count) ? -EFAULT : 0; return copy_from_user((void*)dst, src, count) ? -EFAULT : 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment