Backport block-related changes from "Update kernel probes to more detailed match...

This commit:

commit 7c68b363332170e4db100327ecc9e09b8a79cf29
Author: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Date:   Mon Dec 10 11:12:14 2012 -0500

    Update kernel probes to more detailed match to kernel versions

    Some ifdef's are added to kernel probes instrumentation to make them
    more close to original tracepoints in different kernel versions.
    Supported kernel version are from 2.6.32 to 3.7.

    Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Contains block-layer related changes needed to push compatibility fixes
for newer kernels.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>