projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch v4.4/topic/hibernate into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
mm
/
slab.h
diff --git
a/mm/slab.h
b/mm/slab.h
index 27492eb678f722400147e22da62a68de893497e8..7b608719799763cb075c35e3fd4c15e0fddc18b5 100644
(file)
--- a/
mm/slab.h
+++ b/
mm/slab.h
@@
-170,7
+170,7
@@
ssize_t slabinfo_write(struct file *file, const char __user *buffer,
* may be allocated or freed using these operations.
*/
void __kmem_cache_free_bulk(struct kmem_cache *, size_t, void **);
* may be allocated or freed using these operations.
*/
void __kmem_cache_free_bulk(struct kmem_cache *, size_t, void **);
-
bool
__kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
+
int
__kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
#ifdef CONFIG_MEMCG_KMEM
/*
#ifdef CONFIG_MEMCG_KMEM
/*