mfd: ab8500: Kill "reg" property from binding

[karo-tx-linux.git] / mm / swap.c

diff --git a/mm/swap.c b/mm/swap.c
index 6310dc2008ff408ecd070cde2e54a637bdfa82d0..8a529a01e8fc79ebda8cfe30191fa9fb1d754b77 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -855,9 +855,14 @@ EXPORT_SYMBOL(pagevec_lookup_tag);
 void __init swap_setup(void)
 {
        unsigned long megs = totalram_pages >> (20 - PAGE_SHIFT);
-
 #ifdef CONFIG_SWAP
-       bdi_init(swapper_space.backing_dev_info);
+       int i;
+
+       bdi_init(swapper_spaces[0].backing_dev_info);
+       for (i = 0; i < MAX_SWAPFILES; i++) {
+               spin_lock_init(&swapper_spaces[i].tree_lock);
+               INIT_LIST_HEAD(&swapper_spaces[i].i_mmap_nonlinear);
+       }
 #endif
 
        /* Use a smaller cluster for small-memory machines */