From e779561aaf0305669980a08a2323cc7468289678 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 20 Apr 2012 11:50:30 -0400 Subject: [PATCH] --- yaml --- r: 299401 b: refs/heads/master c: 3d81acb1cdb242378a1acb3eb1bc28c6bb5895f1 h: refs/heads/master i: 299399: 58a4e3fc8d88f07ca1fbceb5794992b1446641d0 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/p2m.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 31d4de030bb6..3d4c7d664189 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 186bab1ce04f99153b7eeb3348438b654c24c24b +refs/heads/master: 3d81acb1cdb242378a1acb3eb1bc28c6bb5895f1 diff --git a/trunk/arch/x86/xen/p2m.c b/trunk/arch/x86/xen/p2m.c index 7ed8cc3434c5..1b267e75158d 100644 --- a/trunk/arch/x86/xen/p2m.c +++ b/trunk/arch/x86/xen/p2m.c @@ -809,17 +809,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; }