diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 15:24:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 15:24:03 -0400 |
commit | f632a8170a6b667ee4e3f552087588f0fe13c4bb (patch) | |
tree | 9fbdd3505f1471364265727dea1bc9d034cbed8f /mm/kmemleak.c | |
parent | ef8f3d48afd6a17a0dae8c277c2f539c2f19fd16 (diff) | |
parent | c33d442328f556460b79aba6058adb37bb555389 (diff) |
Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core and debugfs updates from Greg KH:
"Here is the "big" driver core and debugfs changes for 5.3-rc1
It's a lot of different patches, all across the tree due to some api
changes and lots of debugfs cleanups.
Other than the debugfs cleanups, in this set of changes we have:
- bus iteration function cleanups
- scripts/get_abi.pl tool to display and parse Documentation/ABI
entries in a simple way
- cleanups to Documenatation/ABI/ entries to make them parse easier
due to typos and other minor things
- default_attrs use for some ktype users
- driver model documentation file conversions to .rst
- compressed firmware file loading
- deferred probe fixes
All of these have been in linux-next for a while, with a bunch of
merge issues that Stephen has been patient with me for"
* tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (102 commits)
debugfs: make error message a bit more verbose
orangefs: fix build warning from debugfs cleanup patch
ubifs: fix build warning after debugfs cleanup patch
driver: core: Allow subsystems to continue deferring probe
drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
arch_topology: Remove error messages on out-of-memory conditions
lib: notifier-error-inject: no need to check return value of debugfs_create functions
swiotlb: no need to check return value of debugfs_create functions
ceph: no need to check return value of debugfs_create functions
sunrpc: no need to check return value of debugfs_create functions
ubifs: no need to check return value of debugfs_create functions
orangefs: no need to check return value of debugfs_create functions
nfsd: no need to check return value of debugfs_create functions
lib: 842: no need to check return value of debugfs_create functions
debugfs: provide pr_fmt() macro
debugfs: log errors when something goes wrong
drivers: s390/cio: Fix compilation warning about const qualifiers
drivers: Add generic helper to match by of_node
driver_find_device: Unify the match function with class_find_device()
bus_find_device: Unify the match callback with class_find_device
...
Diffstat (limited to 'mm/kmemleak.c')
-rw-r--r-- | mm/kmemleak.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index aa8f4fa93ca3..dbbd518fb6b3 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c | |||
@@ -2105,14 +2105,9 @@ void __init kmemleak_init(void) | |||
2105 | */ | 2105 | */ |
2106 | static int __init kmemleak_late_init(void) | 2106 | static int __init kmemleak_late_init(void) |
2107 | { | 2107 | { |
2108 | struct dentry *dentry; | ||
2109 | |||
2110 | kmemleak_initialized = 1; | 2108 | kmemleak_initialized = 1; |
2111 | 2109 | ||
2112 | dentry = debugfs_create_file("kmemleak", 0644, NULL, NULL, | 2110 | debugfs_create_file("kmemleak", 0644, NULL, NULL, &kmemleak_fops); |
2113 | &kmemleak_fops); | ||
2114 | if (!dentry) | ||
2115 | pr_warn("Failed to create the debugfs kmemleak file\n"); | ||
2116 | 2111 | ||
2117 | if (kmemleak_error) { | 2112 | if (kmemleak_error) { |
2118 | /* | 2113 | /* |