[PATCH] usb: Patch for USBDEVFS_IOCTL from 32-bit programs

[safe/jmp/linux-2.6] / include / linux / loop.h

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 8220d9c..40f63c9 100644 (file)
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -52,7 +52,7 @@ struct loop_device {
        unsigned        lo_blocksize;
        void            *key_data; 
 
-       int             old_gfp_mask;
+       gfp_t           old_gfp_mask;
 
        spinlock_t              lo_lock;
        struct bio              *lo_bio;
@@ -61,7 +61,7 @@ struct loop_device {
        struct semaphore        lo_sem;
        struct semaphore        lo_ctl_mutex;
        struct semaphore        lo_bh_mutex;
-       atomic_t                lo_pending;
+       int                     lo_pending;
 
        request_queue_t         *lo_queue;
 };