diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:11:04 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:11:04 +1100 |
commit | 28453b0dd37121d3ca47b105ff934e7f831c59a9 (patch) | |
tree | 690af118f88674287a46416d66cbd8f887f9a707 /include | |
parent | 910c3fbabe6e558702c5c13d4ee3f60459971381 (diff) | |
parent | d6ad05a86bde20cdb4efbccc6ea9b24edf001886 (diff) |
Merge remote branch 'catalin/for-next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kmemleak.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h index 3c7497d46ee9..99d9a6766f7e 100644 --- a/include/linux/kmemleak.h +++ b/include/linux/kmemleak.h @@ -32,8 +32,7 @@ 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, unsigned long offset, - size_t length, gfp_t gfp) __ref; +extern void kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) __ref; extern void kmemleak_no_scan(const void *ptr) __ref; static inline void kmemleak_alloc_recursive(const void *ptr, size_t size, @@ -84,8 +83,7 @@ static inline void kmemleak_not_leak(const void *ptr) static inline void kmemleak_ignore(const void *ptr) { } -static inline void kmemleak_scan_area(const void *ptr, unsigned long offset, - size_t length, gfp_t gfp) +static inline void kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) { } static inline void kmemleak_erase(void **ptr) |