Subject: [merged] kmemleak-remove-redundant-code.patch removed from -mm tree
To: lizefan@xxxxxxxxxx,catalin.marinas@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 12:29:28 -0700
The patch titled
Subject: kmemleak: remove redundant code
has been removed from the -mm tree. Its filename was
kmemleak-remove-redundant-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Li Zefan <lizefan@xxxxxxxxxx>
Subject: kmemleak: remove redundant code
- remove kmemleak_padding().
- remove kmemleak_release().
Signed-off-by: Li Zefan <lizefan@xxxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/kmemleak.h | 2 --
mm/kmemleak.c | 7 +------
2 files changed, 1 insertion(+), 8 deletions(-)
diff -puN include/linux/kmemleak.h~kmemleak-remove-redundant-code include/linux/kmemleak.h
--- a/include/linux/kmemleak.h~kmemleak-remove-redundant-code
+++ a/include/linux/kmemleak.h
@@ -30,8 +30,6 @@ extern void kmemleak_alloc_percpu(const
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 -puN mm/kmemleak.c~kmemleak-remove-redundant-code mm/kmemleak.c
--- a/mm/kmemleak.c~kmemleak-remove-redundant-code
+++ a/mm/kmemleak.c
@@ -1549,11 +1549,6 @@ static int kmemleak_open(struct inode *i
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 kmem
.read = seq_read,
.write = kmemleak_write,
.llseek = seq_lseek,
- .release = kmemleak_release,
+ .release = seq_release,
};
static void __kmemleak_do_cleanup(void)
_
Patches currently in -mm which might be from lizefan@xxxxxxxxxx are
origin.patch
kmemcheck-move-hook-into-__alloc_pages_nodemask-for-the-page-allocator.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
