The patch titled
Subject: mm/swapfile.c: fix debugging information problem
has been added to the -mm tree. Its filename is
mm-swapfilec-fix-debugging-information-problem.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-swapfilec-fix-debugging-information-problem.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-swapfilec-fix-debugging-information-problem.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/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Stephen Zhang <stephenzhangzsd@xxxxxxxxx>
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@xxxxxxxxx
Signed-off-by: Stephen Zhang <stephenzhangzsd@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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
@@ -1158,13 +1158,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;
}
@@ -1181,7 +1181,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@xxxxxxxxx are
mm-swapfilec-fix-debugging-information-problem.patch
mm-early_ioremapc-use-__func__-instead-of-function-name.patch
