upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / sound / core / memory.c

diff --git a/sound/core/memory.c b/sound/core/memory.c
index bb4150a..45d419c 100644 (file)
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -257,7 +257,7 @@ char *snd_kmalloc_strdup(const char *string, int flags)
  *
  * 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)
        return copy_to_user(dst, (const void*)src, count) ? -EFAULT : 0;
@@ -288,7 +288,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.
  */
-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)
        return copy_from_user((void*)dst, src, count) ? -EFAULT : 0;