From af4bbb9f68bbb1e7f8473f9f2ab1ff50833f4793 Mon Sep 17 00:00:00 2001 From: Cesar Eduardo Barros Date: Tue, 11 Dec 2012 16:01:14 -0800 Subject: [PATCH] --- yaml --- r: 338743 b: refs/heads/master c: 6555bc035731eab76c0901925034465d3ad2099c h: refs/heads/master i: 338741: 0667a679502ba31f59c0ad861d59893aba73f546 338739: 7d4c95405e0a29c78f39776f3e352c15d5a5cb87 338735: fdc9d7271d0fb8dc14885f439fbb1b1bb9c073ae v: v3 --- [refs] | 2 +- trunk/mm/swapfile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e0db3f12dbcf..99922f6fc3c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf0cac0a09341549dedabcfc2a66dcbc2eaaf2b9 +refs/heads/master: 6555bc035731eab76c0901925034465d3ad2099c diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c index 27a52b731576..0fbb45283c66 100644 --- a/trunk/mm/swapfile.c +++ b/trunk/mm/swapfile.c @@ -1471,7 +1471,6 @@ static void _enable_swap_info(struct swap_info_struct *p, int prio, swap_list.head = swap_list.next = p->type; else swap_info[prev]->next = p->type; - frontswap_init(p->type); } static void enable_swap_info(struct swap_info_struct *p, int prio, @@ -1480,6 +1479,7 @@ static void enable_swap_info(struct swap_info_struct *p, int prio, { spin_lock(&swap_lock); _enable_swap_info(p, prio, swap_map, frontswap_map); + frontswap_init(p->type); spin_unlock(&swap_lock); }