From: Minchan Kim <minchan@kernel.org>
Date: Thu, 7 Feb 2013 01:26:52 +0000 (+1100)
Subject: mm: Get rid of lockdep whinge on sys_swapon
X-Git-Tag: next-20130218~1^2~372
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9a33ef20a06a3c97a06bae2d22059494ca139e64;p=karo-tx-linux.git

mm: Get rid of lockdep whinge on sys_swapon

[1] forgot to initialize spin_lock so lockdep is whingeing
about it. This patch fixes it.

[1] 0f181e0e4, swap: add per-partition lock for swapfile

Signed-off-by: Minchan Kim <minchan@kernel.org>
Reported-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Tested-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Cc: Shaohua Li <shli@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 7df5270fe3c8..9b51266413cd 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1856,6 +1856,7 @@ static struct swap_info_struct *alloc_swap_info(void)
 	p->flags = SWP_USED;
 	p->next = -1;
 	spin_unlock(&swap_lock);
+	spin_lock_init(&p->lock);
 
 	return p;
 }