Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[mv-sheeva.git] / drivers / block / loop.c

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 19a09a1872701cf53eab25ab602c83b50a6ca718..beab6d2643cb0fb27419bed3aa16b87034d2de0f 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1187,7 +1187,7 @@ struct compat_loop_info {
  * - noinlined to reduce stack space usage in main part of driver
  */
 static noinline int
-loop_info64_from_compat(const struct compat_loop_info *arg,
+loop_info64_from_compat(const struct compat_loop_info __user *arg,
                        struct loop_info64 *info64)
 {
        struct compat_loop_info info;