diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
| commit | 75329f1f0c0e2e2ad611734a2ef08309391a4d9f (patch) | |
| tree | 67ca1a13f51fbf2f5af8557e6ff0bb722efab3e6 /mm/bounce.c | |
| parent | b6b301aa9fba57b114c3a00f5f43abf672bd4ecd (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'mm/bounce.c')
| -rw-r--r-- | mm/bounce.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index 06722c403058..bf0cf7c8387b 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -14,6 +14,7 @@ #include <linux/hash.h> #include <linux/highmem.h> #include <linux/blktrace_api.h> +#include <trace/block.h> #include <asm/tlbflush.h> #define POOL_SIZE 64 @@ -21,6 +22,8 @@ static mempool_t *page_pool, *isa_page_pool; +DEFINE_TRACE(block_bio_bounce); + #ifdef CONFIG_HIGHMEM static __init int init_emergency_pool(void) { @@ -222,7 +225,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, if (!bio) return; - blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE); + trace_block_bio_bounce(q, *bio_orig); /* * at least one page was bounced, fill in possible non-highmem |