diff options
| author | Gregory Haskins <ghaskins@novell.com> | 2009-12-07 11:46:37 -0500 |
|---|---|---|
| committer | Gregory Haskins <ghaskins@novell.com> | 2009-12-07 11:46:37 -0500 |
| commit | 275732e4c0715ceed7b1d0af358b12ec6c7bc67e (patch) | |
| tree | c4b7cbec5d82f542700a002795cd9147c07eff23 /drivers/vbus | |
| parent | daa13c9c5df6b8f161281cffa0c0cb63c7e71012 (diff) | |
vbus: allow shmsignals to be named
This will allow the signals to be displayed to the end-user in some
meaningful way later in the series, such as for statistics, etc.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
Diffstat (limited to 'drivers/vbus')
| -rw-r--r-- | drivers/vbus/bus-proxy.c | 6 | ||||
| -rw-r--r-- | drivers/vbus/pci-bridge.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/vbus/bus-proxy.c b/drivers/vbus/bus-proxy.c index 88cd9048335f..5d349427661a 100644 --- a/drivers/vbus/bus-proxy.c +++ b/drivers/vbus/bus-proxy.c @@ -167,8 +167,8 @@ static struct ioq_ops vbus_driver_ioq_ops = { }; -int vbus_driver_ioq_alloc(struct vbus_device_proxy *dev, int id, int prio, - size_t count, struct ioq **ioq) +int vbus_driver_ioq_alloc(struct vbus_device_proxy *dev, const char *name, + int id, int prio, size_t count, struct ioq **ioq) { struct ioq *_ioq; struct ioq_ring_head *head = NULL; @@ -188,7 +188,7 @@ int vbus_driver_ioq_alloc(struct vbus_device_proxy *dev, int id, int prio, head->ver = IOQ_RING_VER; head->count = count; - ret = dev->ops->shm(dev, id, prio, head, len, + ret = dev->ops->shm(dev, name, id, prio, head, len, &head->signal, &signal, 0); if (ret < 0) goto error; diff --git a/drivers/vbus/pci-bridge.c b/drivers/vbus/pci-bridge.c index 80718e693394..fa77318c2a04 100644 --- a/drivers/vbus/pci-bridge.c +++ b/drivers/vbus/pci-bridge.c @@ -262,7 +262,8 @@ vbus_pci_device_close(struct vbus_device_proxy *vdev, int flags) } static int -vbus_pci_device_shm(struct vbus_device_proxy *vdev, int id, int prio, +vbus_pci_device_shm(struct vbus_device_proxy *vdev, const char *name, + int id, int prio, void *ptr, size_t len, struct shm_signal_desc *sdesc, struct shm_signal **signal, int flags) |