2 files changed, 11 insertions, 7 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index 5585f1293593..1a501a4de95c 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -187,6 +187,9 @@ config RESOURCES_64BIT
         help
           This option allows memory and IO resources to be 64 bit.
 
+config PHYS_ADDR_T_64BIT
+        def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT
+
 config ZONE_DMA_FLAG
         int
         default "0" if !ZONE_DMA
diff --git a/mm/filemap.c b/mm/filemap.c
index bf8f9c0c7a83..903bf316912a 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1100,8 +1100,9 @@ page_ok:
 
 page_not_up_to_date:
                 /* Get exclusive access to the page ... */
-                if (lock_page_killable(page))
-                        goto readpage_eio;
+                error = lock_page_killable(page);
+                if (unlikely(error))
+                        goto readpage_error;
 
 page_not_up_to_date_locked:
                 /* Did it get truncated before we got the lock? */
@@ -1130,8 +1131,9 @@ readpage:
                 }
 
                 if (!PageUptodate(page)) {
-                        if (lock_page_killable(page))
-                                goto readpage_eio;
+                        error = lock_page_killable(page);
+                        if (unlikely(error))
+                                goto readpage_error;
                         if (!PageUptodate(page)) {
                                 if (page->mapping == NULL) {
                                         /*
@@ -1143,15 +1145,14 @@ readpage:
                                 }
                                 unlock_page(page);
                                 shrink_readahead_size_eio(filp, ra);
-                                goto readpage_eio;
+                                error = -EIO;
+                                goto readpage_error;
                         }
                         unlock_page(page);
                 }
 
                 goto page_ok;
 
-readpage_eio:
-                error = -EIO;
 readpage_error:
                 /* UHHUH! A synchronous read error occurred. Report it */
                 desc->error = error;