kernel: change in zio-related stuff (see zio commit msg)

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

kernel: change in zio-related stuff (see zio commit msg)
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
4e3f6521 · Alessandro Rubini · 7921d497 · 4e3f6521 · 5f2fc0c3
Commit 4e3f6521 authored Oct 30, 2012 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

fd-irq.c kernel/fd-irq.c +6 -1

zio zio +1 -1

No files found.
--- a/kernel/fd-irq.c
+++ b/kernel/fd-irq.c
@@ -96,8 +96,13 @@ int fd_read_sw_fifo(struct fd_dev *fd, struct zio_channel *chan)
 	ti->tstamp.tv_nsec = t.coarse * 8;
 	ti->tstamp_extra = t.frac;

+	/*
+	 * This is different than it was. We used to fill the active block,
+	 * but now zio copies chan->current_ctrl at a later time, so we
+	 * must fill _those_ attributes instead
+	 */
 	/* The input data is written to attribute values in the active block. */
-	ctrl = zio_get_ctrl(chan->active_block);
+	ctrl = chan->current_ctrl;
 	v = ctrl->attr_channel.ext_val;
 	v[FD_ATTR_TDC_UTC_H]	= t.utc >> 32;
 	v[FD_ATTR_TDC_UTC_L]	= t.utc;

--- a/zio @ 5f2fc0c3
+++ b/zio @ 5f2fc0c3
-Subproject commit 0d81fbbc45aef7b68092e0a1adbd757910a5dc58
+Subproject commit 5f2fc0c3498b2b0bb88ed72ea292650a527626e3