summaryrefslogtreecommitdiffstats
path: root/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
commit8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (patch)
treee2baee2da7d349311c64f206a6a3dd6eb8935211 /0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
parent430af957008fa73bd81840a407110ed7a979ae02 (diff)
downloadkernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.gz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.xz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.zip
kernel-5.9.0-0.rc7.20200930gitfb0155a09b02.21
* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch')
-rw-r--r--0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch b/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
index d4dfa6d37..a8bf98d50 100644
--- a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
+++ b/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
@@ -51,10 +51,10 @@ Signed-off-by: Murphy Zhou <jencce.kernel@gmail.com>
1 file changed, 5 insertions(+)
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
-index 5e252d91eb14..c6e1a9443e9e 100644
+index e362dc3d2028..0c3dfb8eef67 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
-@@ -1960,6 +1960,11 @@ void __init kmemleak_init(void)
+@@ -1958,6 +1958,11 @@ void __init kmemleak_init(void)
*/
static int __init kmemleak_late_init(void)
{