commit 72c26c9a26ea7f2f3d14f162c2ebb07805f724ea
author Ingo Molnar <mingo@elte.hu> Thu Feb 19 09:00:35 2009 +0100
committer Ingo Molnar <mingo@elte.hu> Thu Feb 19 09:00:35 2009 +0100
tree bf1b4bc0b69f96c79474f9edb9cf0e811c95f2dc
parent 37bd824a35a60abc73e5fa8816bd5f50c913d69b
parent ba95fd47d177d46743ad94055908d22840370e06

Merge branch 'linus' into tracing/blktrace

Conflicts:
	block/blktrace.c

Semantic merge:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/trace/blktrace.c

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 3b91da0..e82cb9e 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -176,7 +176,7 @@
 
 	what |= ddir_act[rw & WRITE];
 	what |= MASK_TC_BIT(rw, BARRIER);
-	what |= MASK_TC_BIT(rw, SYNC);
+	what |= MASK_TC_BIT(rw, SYNCIO);
 	what |= MASK_TC_BIT(rw, AHEAD);
 	what |= MASK_TC_BIT(rw, META);
 	what |= MASK_TC_BIT(rw, DISCARD);