Merge 4.4.81 into android-4.4

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 8a2a9ffaf5def6d9c6566d0009cf240eebd9d2f5..b4e739f04ee6097cd84002f024d0343c4ac7816f 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -144,6 +144,18 @@ void kfree(const void *);
 void kzfree(const void *);
 size_t ksize(const void *);
 
+#ifdef CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR
+const char *__check_heap_object(const void *ptr, unsigned long n,
+                               struct page *page);
+#else
+static inline const char *__check_heap_object(const void *ptr,
+                                             unsigned long n,
+                                             struct page *page)
+{
+       return NULL;
+}
+#endif
+
 /*
  * Some archs want to perform DMA into kmalloc caches and need a guaranteed
  * alignment larger than the alignment of a 64-bit integer.