The call to frontswap_init() was added in a place where it is called not only from sys_swapon, but also from sys_swapoff. This pair of patches fixes that. The first patch moves the acquisition of swap_lock from enable_swap_info to two separate helpers, one for sys_swapon and one for sys_swapoff. As a bonus, it also makes the code for sys_swapoff less subtle. The second patch moves the call to frontswap_init() from the common code to the helper used only by sys_swapon. Compile-tested only, but should be safe. Cesar Eduardo Barros (2): mm: refactor reinsert of swap_info in sys_swapoff mm: do not call frontswap_init() during swapoff mm/swapfile.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 1.7.11.7 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>