Revert "xen/p2m: m2p_find_override: use list_for_each_entry_safe"

This reverts commit f977bf653bafd05c48e8db3f789da5e8c3006df1.

[upstream git commit 3d81acb1cdb242378a1acb3eb1bc28c6bb5895f1]

diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index c7736136c6bc2c35e8d41362936e4eeea5031caf..7ece122c6372618e82a2b6a8e7bc5e60623540c0 100644 (file)
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -810,17 +810,21 @@ struct page *m2p_find_override(unsigned long mfn)
 {
        unsigned long flags;
        struct list_head *bucket = &m2p_overrides[mfn_hash(mfn)];
-       struct page *p, *t, *ret;
+       struct page *p, *ret;
 
        ret = NULL;
 
-       list_for_each_entry_safe(p, t, bucket, lru) {
+       spin_lock_irqsave(&m2p_override_lock, flags);
+
+       list_for_each_entry(p, bucket, lru) {
                if (page_private(p) == mfn) {
                        ret = p;
                        break;
                }
        }
 
+       spin_unlock_irqrestore(&m2p_override_lock, flags);
+
        return ret;
 }