Merge branch 'topic/slqb/core' into for-next

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/slqb.c b/mm/slqb.c
index 16928ee7c5ff..5d0642fb6f01 100644
--- a/mm/slqb.c
+++ b/mm/slqb.c
@@ -915,13 +915,13 @@ static inline void setup_object_debug(struct kmem_cache *s,
 }
 
 static inline int alloc_debug_processing(struct kmem_cache *s,
-			void *object, void *addr)
+			void *object, unsigned long addr)
 {
 	return 0;
 }
 
 static inline int free_debug_processing(struct kmem_cache *s,
-			void *object, void *addr)
+			void *object, unsigned long addr)
 {
 	return 0;
 }