Merge branch 'stable/for-linus-3.6' into linux-next

* stable/for-linus-3.6:
  mm/frontswap: fix uninit'ed variable warning

diff --git a/mm/frontswap.c b/mm/frontswap.c
index 6b3e71a2cd483a70c845d33136719c43739a6c68..89dc399d332880d3458aaff9878a351db76b8c97 100644 (file)
--- a/mm/frontswap.c
+++ b/mm/frontswap.c
@@ -292,7 +292,7 @@ static int __frontswap_shrink(unsigned long target_pages,
 void frontswap_shrink(unsigned long target_pages)
 {
        unsigned long pages_to_unuse = 0;
-       int type, ret;
+       int uninitialized_var(type), ret;
 
        /*
         * we don't want to hold swap_lock while doing a very