The patch titled
mm-make-swap-token-dummies-static-inlines-fix-2.txt
has been added to the -mm tree. Its filename is
mm-make-swap-token-dummies-static-inlines-fix-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
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
@@ -432,7 +432,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
mm-make-swap-token-dummies-static-inlines.patch
mm-make-swap-token-dummies-static-inlines-fix.patch
mm-make-swap-token-dummies-static-inlines-fix-2.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
