diff options
| author |   Li Zefan <lizefan@huawei.com> | 2014-04-03 14:46:28 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 16:20:50 -0700 |
| commit | 5f3bf19aeb8ed5cef0926bc10c80b6a50ac6bdeb (patch) | |
| tree | 95f86bb624bc93348564911d93b85fc07bf50f94 | |
| parent | kmemleak: allow freeing internal objects after kmemleak was disabled (diff) | |
| download | linux-dev-5f3bf19aeb8ed5cef0926bc10c80b6a50ac6bdeb.tar.xz linux-dev-5f3bf19aeb8ed5cef0926bc10c80b6a50ac6bdeb.zip | |
kmemleak: remove redundant code
Remove kmemleak_padding() and kmemleak_release().
Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/kmemleak.h | 2 | ||||
| -rw-r--r-- | mm/kmemleak.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h index 2a5e5548a1d2..5bb424659c04 100644 --- a/include/linux/kmemleak.h +++ b/include/linux/kmemleak.h @@ -30,8 +30,6 @@ extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref; extern void kmemleak_free(const void *ptr) __ref; extern void kmemleak_free_part(const void *ptr, size_t size) __ref; extern void kmemleak_free_percpu(const void __percpu *ptr) __ref; -extern void kmemleak_padding(const void *ptr, unsigned long offset, - size_t size) __ref; extern void kmemleak_not_leak(const void *ptr) __ref; extern void kmemleak_ignore(const void *ptr) __ref; extern void kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) __ref; diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 06cd22035a92..6f90d003830a 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1549,11 +1549,6 @@ static int kmemleak_open(struct inode *inode, struct file *file) return seq_open(file, &kmemleak_seq_ops); } -static int kmemleak_release(struct inode *inode, struct file *file) -{ - return seq_release(inode, file); -} - static int dump_str_object_info(const char *str) { unsigned long flags; @@ -1691,7 +1686,7 @@ static const struct file_operations kmemleak_fops = { .read = seq_read, .write = kmemleak_write, .llseek = seq_lseek, - .release = kmemleak_release, + .release = seq_release, }; static void __kmemleak_do_cleanup(void) |