summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-05-15 14:09:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:23 +0100
commitdea4a69cfcf5c1653ecf9b8f68210a239a0f426b (patch)
treeff247edc8678c8f8055fb8f4c358c2fd22ebe287 /meta
parent53d2def2251960acf0e7d431d334172bda333ffb (diff)
downloadpoky-dea4a69cfcf5c1653ecf9b8f68210a239a0f426b.tar.gz
lttng-modules: Fix build with older kernels for 2.3.3 as 2.4.0
Apply the change "lttng-modules: Fix 3.14 bio tracepoints" to 2.3.3 as well as 2.4.0. (From OE-Core rev: a419ad43a5b3aa5bc3aa095af4d79abe4c24b0d7) (From OE-Core rev: d02b69b622d0900add7a30879b82281be2cfd88a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch122
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb2
2 files changed, 1 insertions, 123 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
deleted file mode 100644
index 3644a47d5a..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
+++ /dev/null
@@ -1,122 +0,0 @@
1Fix errors like
2
3block.h:344:24: error: 'struct bio' has no member named 'bi_sector'
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending
7
8Index: git/instrumentation/events/lttng-module/block.h
9===================================================================
10--- git.orig/instrumentation/events/lttng-module/block.h 2014-05-02 22:20:01.814125429 -0700
11+++ git/instrumentation/events/lttng-module/block.h 2014-05-02 22:28:48.927455709 -0700
12@@ -341,9 +341,9 @@
13 TP_fast_assign(
14 tp_assign(dev, bio->bi_bdev ?
15 bio->bi_bdev->bd_dev : 0)
16- tp_assign(sector, bio->bi_sector)
17- tp_assign(nr_sector, bio->bi_size >> 9)
18- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
19+ tp_assign(sector, bio->bi_iter.bi_sector)
20+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
21+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
22 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
23 ),
24
25@@ -385,14 +385,14 @@
26
27 TP_fast_assign(
28 tp_assign(dev, bio->bi_bdev->bd_dev)
29- tp_assign(sector, bio->bi_sector)
30- tp_assign(nr_sector, bio->bi_size >> 9)
31+ tp_assign(sector, bio->bi_iter.bi_sector)
32+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
33 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
34 tp_assign(error, error)
35 #else
36 tp_assign(error, 0)
37 #endif
38- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
39+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
40 ),
41
42 TP_printk("%d,%d %s %llu + %u [%d]",
43@@ -419,9 +419,9 @@
44
45 TP_fast_assign(
46 tp_assign(dev, bio->bi_bdev->bd_dev)
47- tp_assign(sector, bio->bi_sector)
48- tp_assign(nr_sector, bio->bi_size >> 9)
49- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
50+ tp_assign(sector, bio->bi_iter.bi_sector)
51+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
52+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
53 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
54 ),
55
56@@ -485,9 +485,9 @@
57
58 TP_fast_assign(
59 tp_assign(dev, bio->bi_bdev->bd_dev)
60- tp_assign(sector, bio->bi_sector)
61- tp_assign(nr_sector, bio->bi_size >> 9)
62- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
63+ tp_assign(sector, bio->bi_iter.bi_sector)
64+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
65+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
66 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
67 ),
68
69@@ -513,9 +513,9 @@
70
71 TP_fast_assign(
72 tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
73- tp_assign(sector, bio->bi_sector)
74- tp_assign(nr_sector, bio->bi_size >> 9)
75- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
76+ tp_assign(sector, bio->bi_iter.bi_sector)
77+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
78+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
79 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
80 ),
81
82@@ -587,10 +587,10 @@
83
84 TP_fast_assign(
85 tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
86- tp_assign(sector, bio ? bio->bi_sector : 0)
87- tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
88+ tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
89+ tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
90 blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
91- bio ? bio->bi_size >> 9 : 0)
92+ bio ? bio->bi_iter.bi_size >> 9 : 0)
93 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
94 ),
95
96@@ -759,9 +759,9 @@
97
98 TP_fast_assign(
99 tp_assign(dev, bio->bi_bdev->bd_dev)
100- tp_assign(sector, bio->bi_sector)
101+ tp_assign(sector, bio->bi_iter.bi_sector)
102 tp_assign(new_sector, new_sector)
103- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
104+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
105 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
106 ),
107
108@@ -805,11 +805,11 @@
109
110 TP_fast_assign(
111 tp_assign(dev, bio->bi_bdev->bd_dev)
112- tp_assign(sector, bio->bi_sector)
113- tp_assign(nr_sector, bio->bi_size >> 9)
114+ tp_assign(sector, bio->bi_iter.bi_sector)
115+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
116 tp_assign(old_dev, dev)
117 tp_assign(old_sector, from)
118- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
119+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
120 ),
121
122 TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
index 94e18b2622..81a3983c64 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
@@ -15,7 +15,7 @@ PV = "2.3.3"
15 15
16SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \ 16SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
17 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ 17 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
18 file://fixup_block_driver.patch \ 18 file://bio-bvec-iter.patch \
19 " 19 "
20 20
21export INSTALL_MOD_DIR="kernel/lttng-modules" 21export INSTALL_MOD_DIR="kernel/lttng-modules"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-27 21:48:25 +0000