diff options
| author |   Darren Hart <dvhart@linux.intel.com> | 2011-12-01 16:07:53 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 16:54:07 +0000 |
| commit | 64f3e247df44f4f165d9ae0574d9c0c56e0a4232 (patch) | |
| tree | 576f17716df2cacafecb4a46680fdd0a2c7614df /meta/recipes-kernel/trace-cmd/trace-cmd | |
| parent | a2070fb645bbb1542b304f499b7f1210523836b9 (diff) | |
| download | openembedded-core-contrib-64f3e247df44f4f165d9ae0574d9c0c56e0a4232.tar.gz | |
trace-cmd: Add blktrace_api compatibility for TC_BARRIER
Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd
can build regardless of the linux-kernel-headers version.
This is intended as a stop-gap to get the builds working again. A
proper fix will need to be discussed with the trace-cmd community.
RP: Tweaked the SRC_URI to remove unnecessary path and added PR bump
(From OE-Core rev: 869372e7e11b9ba38fcfb721c460404c6f31db95)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/trace-cmd/trace-cmd')
| -rw-r--r-- | meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch new file mode 100644 index 0000000000..0789e9fdf7 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch @@ -0,0 +1,29 @@ +trace-cmd: Add blktrace_api compatibility for TC_BARRIER + +Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd +can build regardless of the linux-kernel-headers version. + +Upstream-Status: Innapropriate [Stop gap] + +Signed-off-by: Darren Hart <dvhart@linux.intel.com> + +diff --git a/plugin_blk.c b/plugin_blk.c +index 9327b17..c8e5e1c 100644 +--- a/plugin_blk.c ++++ b/plugin_blk.c +@@ -44,6 +44,15 @@ struct blk_data { + unsigned short pdu_len; + }; + ++/* ++ * Newer kernels don't define BLK_TC_BARRIER and have replaced it with ++ * BLK_TC_FLUSH. In this case, define it here and report FLUSHES as BARRIERS as ++ * a workaround, as described in: ++ * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=c09c47caedc9854d59378d6e34c989e51cfdd2b4 ++ */ ++#ifndef BLK_TC_BARRIER ++#define BLK_TC_BARRIER 1<<2 ++#endif + static void fill_rwbs(char *rwbs, int action, unsigned int bytes) + { + int i = 0; |