Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / mm / usercopy.c

diff --git a/mm/usercopy.c b/mm/usercopy.c
index 4e1da70..c1ee15a 100644 (file)
--- a/mm/usercopy.c
+++ b/mm/usercopy.c
@@ -161,7 +161,7 @@ static inline void check_bogus_address(const unsigned long ptr, unsigned long n,
 static inline void check_heap_object(const void *ptr, unsigned long n,
                                     bool to_user)
 {
-       uintptr_t addr = (uintptr_t)ptr;
+       unsigned long addr = (unsigned long)ptr;
        unsigned long offset;
        struct folio *folio;