Merge tag 'efi-urgent' into x86/efi

[pandora-kernel.git] / include / linux / swapops.h

diff --git a/include/linux/swapops.h b/include/linux/swapops.h
index c0f7526..6adfb7b 100644 (file)
--- a/include/linux/swapops.h
+++ b/include/linux/swapops.h
@@ -54,7 +54,7 @@ static inline pgoff_t swp_offset(swp_entry_t entry)
 /* check whether a pte points to a swap entry */
 static inline int is_swap_pte(pte_t pte)
 {
-       return !pte_none(pte) && !pte_present(pte) && !pte_file(pte);
+       return !pte_none(pte) && !pte_present_nonuma(pte) && !pte_file(pte);
 }
 #endif