The patch titled mm-make-swap-token-dummies-static-inlines-fix-2.txt has been removed from the -mm tree. Its filename was mm-make-swap-token-dummies-static-inlines-fix-2.patch This patch was dropped because it was folded into mm-make-swap-token-dummies-static-inlines.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm-make-swap-token-dummies-static-inlines-fix-2.txt From: Johannes Weiner <hannes@xxxxxxxxxxx> disable_swap_token() doesn't take an argument. This fixes the !CONFIG_SWAP dummy. Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/swap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/swap.h~mm-make-swap-token-dummies-static-inlines-fix-2 include/linux/swap.h --- a/include/linux/swap.h~mm-make-swap-token-dummies-static-inlines-fix-2 +++ a/include/linux/swap.h @@ -454,7 +454,7 @@ static inline int has_swap_token(struct return 0; } -static inline void disable_swap_token(struct mm_struct *mm) +static inline void disable_swap_token(void) { } _ Patches currently in -mm which might be from hannes@xxxxxxxxxxx are origin.patch mm-make-swap-token-dummies-static-inlines.patch mm-make-swap-token-dummies-static-inlines-fix-2.patch mm-count-only-reclaimable-lru-pages-v2.patch vmscan-move-clearpageactive-from-move_active_pages-to-shrink_active_list.patch vmscan-kill-unnecessary-page-flag-test.patch vmscan-kill-unnecessary-prefetch.patch mm-perform-non-atomic-test-clear-of-pg_mlocked-on-free.patch mm-warn-once-when-a-page-is-freed-with-pg_mlocked-set.patch mm-add_to_swap_cache-must-not-sleep.patch mm-add_to_swap_cache-does-not-return-eexist.patch mm-drop-unneeded-double-negations.patch mm-introduce-page_lru_base_type.patch mm-introduce-page_lru_base_type-fix.patch mm-return-boolean-from-page_is_file_cache.patch mm-return-boolean-from-page_has_private.patch mm-document-is_page_cache_freeable.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html