| From: Daniel Jordan <daniel.m.jordan@oracle.com> |
| Date: Thu, 14 Jun 2018 15:26:21 -0700 |
| Subject: mm/swapfile.c: fix swap_count comment about nonexistent SWAP_HAS_CONT |
| |
| commit 955c97f0859abef698e77f5697f5c4008303abb9 upstream. |
| |
| Commit 570a335b8e22 ("swap_info: swap count continuations") introduces |
| COUNT_CONTINUED but refers to it incorrectly as SWAP_HAS_CONT in a |
| comment in swap_count. Fix it. |
| |
| Link: http://lkml.kernel.org/r/20180612175919.30413-1-daniel.m.jordan@oracle.com |
| Fixes: 570a335b8e22 ("swap_info: swap count continuations") |
| Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com> |
| Reviewed-by: Andrew Morton <akpm@linux-foundation.org> |
| Cc: "Huang, Ying" <ying.huang@intel.com> |
| Cc: Hugh Dickins <hughd@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| mm/swapfile.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/mm/swapfile.c |
| +++ b/mm/swapfile.c |
| @@ -88,7 +88,7 @@ static atomic_t proc_poll_event = ATOMIC |
| |
| static inline unsigned char swap_count(unsigned char ent) |
| { |
| - return ent & ~SWAP_HAS_CACHE; /* may include SWAP_HAS_CONT flag */ |
| + return ent & ~SWAP_HAS_CACHE; /* may include COUNT_CONTINUED flag */ |
| } |
| |
| /* returns 1 if swap entry is freed */ |