projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] drop-pagecache
[powerpc.git]
/
mm
/
mempool.c
diff --git
a/mm/mempool.c
b/mm/mempool.c
index
9a72f7d
..
1a99b80
100644
(file)
--- a/
mm/mempool.c
+++ b/
mm/mempool.c
@@
-112,7
+112,7
@@
EXPORT_SYMBOL(mempool_create_node);
* while this function is running. mempool_alloc() & mempool_free()
* might be called (eg. from IRQ contexts) while this function executes.
*/
* while this function is running. mempool_alloc() & mempool_free()
* might be called (eg. from IRQ contexts) while this function executes.
*/
-int mempool_resize(mempool_t *pool, int new_min_nr,
unsigned int __nocas
t gfp_mask)
+int mempool_resize(mempool_t *pool, int new_min_nr,
gfp_
t gfp_mask)
{
void *element;
void **new_elements;
{
void *element;
void **new_elements;
@@
-200,12
+200,12
@@
EXPORT_SYMBOL(mempool_destroy);
* *never* fails when called from process contexts. (it might
* fail if called from an IRQ context.)
*/
* *never* fails when called from process contexts. (it might
* fail if called from an IRQ context.)
*/
-void * mempool_alloc(mempool_t *pool,
unsigned int __nocas
t gfp_mask)
+void * mempool_alloc(mempool_t *pool,
gfp_
t gfp_mask)
{
void *element;
unsigned long flags;
wait_queue_t wait;
{
void *element;
unsigned long flags;
wait_queue_t wait;
-
in
t gfp_temp;
+
gfp_
t gfp_temp;
might_sleep_if(gfp_mask & __GFP_WAIT);
might_sleep_if(gfp_mask & __GFP_WAIT);
@@
-276,7
+276,7
@@
EXPORT_SYMBOL(mempool_free);
/*
* A commonly used alloc and free fn.
*/
/*
* A commonly used alloc and free fn.
*/
-void *mempool_alloc_slab(
unsigned int __nocas
t gfp_mask, void *pool_data)
+void *mempool_alloc_slab(
gfp_
t gfp_mask, void *pool_data)
{
kmem_cache_t *mem = (kmem_cache_t *) pool_data;
return kmem_cache_alloc(mem, gfp_mask);
{
kmem_cache_t *mem = (kmem_cache_t *) pool_data;
return kmem_cache_alloc(mem, gfp_mask);