patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-s390 / idals.h

diff --git a/include/asm-s390/idals.h b/include/asm-s390/idals.h
index ad444dc..8f72c9b 100644 (file)
--- a/include/asm-s390/idals.h
+++ b/include/asm-s390/idals.h
@@ -218,7 +218,7 @@ idal_buffer_set_cda(struct idal_buffer *ib, struct ccw1 *ccw)
  * Copy count bytes from an idal buffer to user memory
  */
 static inline size_t
-idal_buffer_to_user(struct idal_buffer *ib, void *to, size_t count)
+idal_buffer_to_user(struct idal_buffer *ib, void __user *to, size_t count)
 {
        size_t left;
        int i;
@@ -228,7 +228,7 @@ idal_buffer_to_user(struct idal_buffer *ib, void *to, size_t count)
                left = copy_to_user(to, ib->data[i], IDA_BLOCK_SIZE);
                if (left)
                        return left + count - IDA_BLOCK_SIZE;
-               to = (void *) to + IDA_BLOCK_SIZE;
+               to = (void __user *) to + IDA_BLOCK_SIZE;
                count -= IDA_BLOCK_SIZE;
        }
        return copy_to_user(to, ib->data[i], count);
@@ -238,7 +238,7 @@ idal_buffer_to_user(struct idal_buffer *ib, void *to, size_t count)
  * Copy count bytes from user memory to an idal buffer
  */
 static inline size_t
-idal_buffer_from_user(struct idal_buffer *ib, const void *from, size_t count)
+idal_buffer_from_user(struct idal_buffer *ib, const void __user *from, size_t count)
 {
        size_t left;
        int i;
@@ -248,7 +248,7 @@ idal_buffer_from_user(struct idal_buffer *ib, const void *from, size_t count)
                left = copy_from_user(ib->data[i], from, IDA_BLOCK_SIZE);
                if (left)
                        return left + count - IDA_BLOCK_SIZE;
-               from = (void *) from + IDA_BLOCK_SIZE;
+               from = (void __user *) from + IDA_BLOCK_SIZE;
                count -= IDA_BLOCK_SIZE;
        }
        return copy_from_user(ib->data[i], from, count);