X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=block%2Fblk.h;h=7550364c326c3636d67f12f21b004d6e4f6a9736;hb=HEAD;hp=a19b7b42e6503cd5ca5e03aba41b894a891929b8;hpb=68bf6bfdcf56b5e6567a668ffc15d5e449356c02;p=linux-2.6-microblaze.git

diff --git a/block/blk.h b/block/blk.h
index a19b7b42e650..5cac4e29ae17 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -534,7 +534,7 @@ static inline u64 blk_time_get_ns(void)
 {
 	struct blk_plug *plug = current->plug;
 
-	if (!plug)
+	if (!plug || !in_task())
 		return ktime_get_ns();
 
 	/*