Merge branch 'linus' into x86/urgent, to refresh the tree

[linux-2.6-microblaze.git] / drivers / hv / hv_balloon.c

diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index b1b7880..4163151 100644 (file)
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -689,7 +689,7 @@ static void hv_page_online_one(struct hv_hotadd_state *has, struct page *pg)
        __online_page_increment_counters(pg);
        __online_page_free(pg);
 
-       WARN_ON_ONCE(!spin_is_locked(&dm_device.ha_lock));
+       lockdep_assert_held(&dm_device.ha_lock);
        dm_device.num_pages_onlined++;
 }