From 11ec2bc9fc2e664c8c7622a2176f920ce06dae96 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 20 Apr 2012 12:03:32 -0400 Subject: [PATCH] Revert "xen/p2m: m2p_find_override: use list_for_each_entry_safe" This reverts commit f977bf653bafd05c48e8db3f789da5e8c3006df1. [upstream git commit 3d81acb1cdb242378a1acb3eb1bc28c6bb5895f1] --- arch/x86/xen/p2m.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index c7736136c6bc..7ece122c6372 100644 --- 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; } -- 2.50.1