From: Vincent Hanquez <tab@snarc.org>

Signed-off-by: Vincent Hanquez <tab@snarc.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/mm/swapfile.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN mm/swapfile.c~kill-one-if-x-vfreex-usage mm/swapfile.c
--- 25/mm/swapfile.c~kill-one-if-x-vfreex-usage	2005-01-10 17:29:38.037104400 -0800
+++ 25-akpm/mm/swapfile.c	2005-01-10 17:29:38.041103792 -0800
@@ -1634,8 +1634,7 @@ bad_swap_2:
 		++least_priority;
 	swap_list_unlock();
 	destroy_swap_extents(p);
-	if (swap_map)
-		vfree(swap_map);
+	vfree(swap_map);
 	if (swap_file)
 		filp_close(swap_file, NULL);
 out:
_