linux-next: build failure after merge of the modem_shm tree

[Stephen Rothwell]

Hi Sjur,

After merging the modem_shm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/remoteproc/remoteproc_virtio.c: In function 'rproc_virtio_new_vringh':
drivers/remoteproc/remoteproc_virtio.c:234:16: error: 'struct rproc_vdev' has no member named 'dfeatures'

Caused by commit 624f8ef43b6c ("remoteproc: Support virtio config space")
from the modem_shm tree interacting with commit 414a13c3d236
("remoteproc: Add support for vringh (Host vrings)") from the virtio tree.

I applied the following merge fix patch and can carry it as necessary:

From 66e8d9a9dc648db6abc27b7e9b6d99840b25642f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 20 Feb 2013 16:47:58 +1100
Subject: [PATCH] remoteproc: fix for dfeatures change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/remoteproc/remoteproc_virtio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 33ca91f..dba33ff 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -231,7 +231,7 @@ rproc_virtio_new_vringh(struct virtio_device *vdev, unsigned index,
 	rvring->vringh = vrh;
 
 	err = vringh_init_kern(vrh,
-			       rvdev->dfeatures,
+			       rvdev->rsc->dfeatures,
 			       rvring->len,
 			       false,
 			       vrh->vring.desc,
-- 
1.8.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature