* [merged] mm-swapfilec-fix-debugging-information-problem.patch removed from -mm tree
@ 2021-02-25 19:13 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2021-02-25 19:13 UTC (permalink / raw)
To: mm-commits, stephenzhangzsd
The patch titled
Subject: mm/swapfile.c: fix debugging information problem
has been removed from the -mm tree. Its filename was
mm-swapfilec-fix-debugging-information-problem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Stephen Zhang <stephenzhangzsd@gmail.com>
Subject: mm/swapfile.c: fix debugging information problem
Once the function name is changed, it may be easy to forget to modify the
corresponding code here.
Link: https://lkml.kernel.org/r/1611369120-2276-1-git-send-email-stephenzhangzsd@gmail.com
Signed-off-by: Stephen Zhang <stephenzhangzsd@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/swapfile.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/mm/swapfile.c~mm-swapfilec-fix-debugging-information-problem
+++ a/mm/swapfile.c
@@ -1157,13 +1157,13 @@ static struct swap_info_struct *__swap_i
return p;
bad_offset:
- pr_err("swap_info_get: %s%08lx\n", Bad_offset, entry.val);
+ pr_err("%s: %s%08lx\n", __func__, Bad_offset, entry.val);
goto out;
bad_device:
- pr_err("swap_info_get: %s%08lx\n", Unused_file, entry.val);
+ pr_err("%s: %s%08lx\n", __func__, Unused_file, entry.val);
goto out;
bad_nofile:
- pr_err("swap_info_get: %s%08lx\n", Bad_file, entry.val);
+ pr_err("%s: %s%08lx\n", __func__, Bad_file, entry.val);
out:
return NULL;
}
@@ -1180,7 +1180,7 @@ static struct swap_info_struct *_swap_in
return p;
bad_free:
- pr_err("swap_info_get: %s%08lx\n", Unused_offset, entry.val);
+ pr_err("%s: %s%08lx\n", __func__, Unused_offset, entry.val);
out:
return NULL;
}
_
Patches currently in -mm which might be from stephenzhangzsd@gmail.com are
mm-early_ioremapc-use-__func__-instead-of-function-name.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-25 19:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-25 19:13 [merged] mm-swapfilec-fix-debugging-information-problem.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).