diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
| commit | be750231ce1599b86fbba213e3da8344ece262e2 (patch) | |
| tree | a506c461082692bb5bab8b9bb63a762816329454 /mm | |
| parent | perf tools: Add some comments to the event definitions (diff) | |
| parent | perf record: Fix typo in pid_synthesize_comm_event (diff) | |
| download | linux-be750231ce1599b86fbba213e3da8344ece262e2.tar.xz linux-be750231ce1599b86fbba213e3da8344ece262e2.zip | |
Merge branch 'perfcounters/urgent' into perfcounters/core
Conflicts:
kernel/perf_counter.c
Merge reason: update to latest upstream (-rc6) and resolve
the conflict with urgent fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mempool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/mempool.c b/mm/mempool.c index a46eb1b4bb66..32e75d400503 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -303,14 +303,14 @@ EXPORT_SYMBOL(mempool_free_slab); */ void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data) { - size_t size = (size_t)(long)pool_data; + size_t size = (size_t)pool_data; return kmalloc(size, gfp_mask); } EXPORT_SYMBOL(mempool_kmalloc); void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data) { - size_t size = (size_t) pool_data; + size_t size = (size_t)pool_data; return kzalloc(size, gfp_mask); } EXPORT_SYMBOL(mempool_kzalloc); |