diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-15 06:40:47 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-15 06:40:47 +0200 |
commit | e1653ae6c388acd8cc7ad3a05da14946fdf9ded6 (patch) | |
tree | 5727a249e83f18a7dc17236e789233bfd6993dc5 /0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch | |
parent | 27857783d0156125a03d14c891556e79dc45f5c3 (diff) | |
parent | 23d80a61e9c41d533a0377712ab7b6761ce52bf9 (diff) | |
download | kernel-e1653ae6c388acd8cc7ad3a05da14946fdf9ded6.tar.gz kernel-e1653ae6c388acd8cc7ad3a05da14946fdf9ded6.tar.xz kernel-e1653ae6c388acd8cc7ad3a05da14946fdf9ded6.zip |
merge origin
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.patch | 10 |
1 files changed, 5 insertions, 5 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 e87612358..2e055125c 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 @@ -1,4 +1,4 @@ -From 14d329da03ea1145efce866b127b10ea6390b5e1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Murphy Zhou <jencce.kernel@gmail.com> Date: Sun, 29 Sep 2019 17:56:59 +0800 Subject: [PATCH] mm/kmemleak: skip late_init if not skip disable @@ -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 03a8d84badad..b9baf617fe35 100644 +index e362dc3d2028..0c3dfb8eef67 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c -@@ -1946,6 +1946,11 @@ void __init kmemleak_init(void) +@@ -1958,6 +1958,11 @@ void __init kmemleak_init(void) */ static int __init kmemleak_late_init(void) { @@ -64,8 +64,8 @@ index 03a8d84badad..b9baf617fe35 100644 + } + kmemleak_initialized = 1; - + debugfs_create_file("kmemleak", 0644, NULL, NULL, &kmemleak_fops); -- -2.21.0 +2.26.2 |