diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
| commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
| tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch | |
| parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
| parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
| download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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 | 4 |
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) { |