diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
| commit | 9d8cc94b05933f016a226898842277611bafd566 (patch) | |
| tree | 44bd1fc40427c8d932bb2d5bcac9f86b3b1feedc /0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch | |
| parent | 6243c80866b326be88265a9756403a577110d2d9 (diff) | |
| parent | fa13b59d638eb5dd773694de898e8f99d1d85526 (diff) | |
| download | kernel-9d8cc94b05933f016a226898842277611bafd566.tar.gz kernel-9d8cc94b05933f016a226898842277611bafd566.tar.xz kernel-9d8cc94b05933f016a226898842277611bafd566.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.1.vanilla.1.fc34kernel-5.9.0-0.rc1.1.vanilla.1.fc33kernel-5.9.0-0.rc1.1.vanilla.1.fc32kernel-5.9.0-0.rc1.1.vanilla.1.fc31
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 2e055125c..e13cab25c 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 e362dc3d2028..0c3dfb8eef67 100644 +index 5e252d91eb14..c6e1a9443e9e 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c -@@ -1958,6 +1958,11 @@ void __init kmemleak_init(void) +@@ -1960,6 +1960,11 @@ void __init kmemleak_init(void) */ static int __init kmemleak_late_init(void) { |