lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9

Update the structure to work with immutable bio_vecs

(From OE-Core rev: 09d3d8f97d6c60707b8dfb3fa5b04fa2efe6f6f6)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 125 insertions, 1 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
new file mode 100644
index 0000000000..3644a47d5a
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
@@ -0,0 +1,122 @@
+Fix errors like
+
+block.h:344:24: error: 'struct bio' has no member named 'bi_sector'
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: git/instrumentation/events/lttng-module/block.h
+===================================================================
+--- git.orig/instrumentation/events/lttng-module/block.h	2014-05-02 22:20:01.814125429 -0700
++++ git/instrumentation/events/lttng-module/block.h	2014-05-02 22:28:48.927455709 -0700
+@@ -341,9 +341,9 @@
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ?
+ 					  bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -385,14 +385,14 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+ 		tp_assign(error, error)
+ #else
+ 		tp_assign(error, 0)
+ #endif
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	TP_printk("%d,%d %s %llu + %u [%d]",
+@@ -419,9 +419,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -485,9 +485,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -513,9 +513,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -587,10 +587,10 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio ? bio->bi_sector : 0)
+-		tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
++		tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
++		tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
+-			      bio ? bio->bi_size >> 9 : 0)
++			      bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+         ),
+ 
+@@ -759,9 +759,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
++		tp_assign(sector, bio->bi_iter.bi_sector)
+ 		tp_assign(new_sector, new_sector)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -805,11 +805,11 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ 		tp_assign(old_dev, dev)
+ 		tp_assign(old_sector, from)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	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 dd065463ae..94e18b2622 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
@@ -14,7 +14,9 @@ SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377"
 PV = "2.3.3"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
+           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
+           file://fixup_block_driver.patch \
+          "
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 export KERNEL_SRC="${STAGING_KERNEL_DIR}"