diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /mm/mempool.c | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'mm/mempool.c')
| -rw-r--r-- | mm/mempool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempool.c b/mm/mempool.c index 9a72f7d918fa..65f2957b8d51 100644 --- a/mm/mempool.c +++ b/mm/mempool.c | |||
| @@ -205,7 +205,7 @@ void * mempool_alloc(mempool_t *pool, unsigned int __nocast gfp_mask) | |||
| 205 | void *element; | 205 | void *element; |
| 206 | unsigned long flags; | 206 | unsigned long flags; |
| 207 | wait_queue_t wait; | 207 | wait_queue_t wait; |
| 208 | int gfp_temp; | 208 | unsigned int gfp_temp; |
| 209 | 209 | ||
| 210 | might_sleep_if(gfp_mask & __GFP_WAIT); | 210 | might_sleep_if(gfp_mask & __GFP_WAIT); |
| 211 | 211 | ||