search for: 1078,7

tree: git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next head: 2936f1d4f3e8247bd519feba7892371d5e4c6603 commit: 105acf608f25d5e0d9fef669299a5438b7b114ee [16/21] vhost/scsi: Add ANY_LAYOUT vhost_skip_iovec_bytes helper reproduce: # apt-get install sparse git checkout 105acf608f25d5e0d9fef669299a5438b7b114ee make ARCH=x86_64 allmodconfig make C=1

tree: git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next head: 2936f1d4f3e8247bd519feba7892371d5e4c6603 commit: 105acf608f25d5e0d9fef669299a5438b7b114ee [16/21] vhost/scsi: Add ANY_LAYOUT vhost_skip_iovec_bytes helper reproduce: # apt-get install sparse git checkout 105acf608f25d5e0d9fef669299a5438b7b114ee make ARCH=x86_64 allmodconfig make C=1

...FBytes; "part_end", FBytes; "part_size", FBytes; + "part_type", FString; ]; s_camel_name = "Partition" }; diff --git a/resize/resize.ml b/resize/resize.ml index 84fd6d4..8f8f67f 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -1078,7 +1078,7 @@ read the man page virt-resize(1). *) p_name = ""; p_part = { G.part_num = 0l; part_start = 0L; part_end = 0L; - part_size = 0L }; + part_size = 0L; part_type = "" }; p_bootable = fa...

...{ kref_put(&ubufs->kref, vhost_net_zerocopy_done_signal); wait_event(ubufs->wait, !atomic_read(&ubufs->kref.refcount)); +} + +static void vhost_net_ubuf_put_wait_and_free(struct vhost_net_ubuf_ref *ubufs) +{ + vhost_net_ubuf_put_and_wait(ubufs); kfree(ubufs); } @@ -1073,7 +1078,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) mutex_unlock(&vq->mutex); if (oldubufs) { - vhost_net_ubuf_put_and_wait(oldubufs); + vhost_net_ubuf_put_wait_and_free(oldubufs); mutex_lock(&vq->mutex); vhost_zerocopy_signal_used(n, vq);...

...{ kref_put(&ubufs->kref, vhost_net_zerocopy_done_signal); wait_event(ubufs->wait, !atomic_read(&ubufs->kref.refcount)); +} + +static void vhost_net_ubuf_put_wait_and_free(struct vhost_net_ubuf_ref *ubufs) +{ + vhost_net_ubuf_put_and_wait(ubufs); kfree(ubufs); } @@ -1073,7 +1078,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) mutex_unlock(&vq->mutex); if (oldubufs) { - vhost_net_ubuf_put_and_wait(oldubufs); + vhost_net_ubuf_put_wait_and_free(oldubufs); mutex_lock(&vq->mutex); vhost_zerocopy_signal_used(n, vq);...

...Should it be static? Signed-off-by: Fengguang Wu <fengguang.wu at intel.com> --- scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index d888bd9..8ac003f 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -1078,7 +1078,7 @@ vhost_scsi_send_bad_target(struct vhost_scsi *vs, pr_err("Faulted on virtio_scsi_cmd_resp\n"); } -int vhost_skip_iovec_bytes(size_t bytes, int max_niov, +static int vhost_skip_iovec_bytes(size_t bytes, int max_niov, struct iovec *iov_in, size_t off_in, str...

...Should it be static? Signed-off-by: Fengguang Wu <fengguang.wu at intel.com> --- scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index d888bd9..8ac003f 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -1078,7 +1078,7 @@ vhost_scsi_send_bad_target(struct vhost_scsi *vs, pr_err("Faulted on virtio_scsi_cmd_resp\n"); } -int vhost_skip_iovec_bytes(size_t bytes, int max_niov, +static int vhost_skip_iovec_bytes(size_t bytes, int max_niov, struct iovec *iov_in, size_t off_in, str...

...CR_TYPE_W 2 #define CR_TYPE_RW 3 +#define MSR_TYPE_R 1 +#define MSR_TYPE_W 2 +#define MSR_TYPE_RW 3 + #define ASYNC_PF_PER_VCPU 64 enum kvm_reg { diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index e3369562d6fe..0021d8c2feca 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1078,7 +1078,7 @@ static bool msr_write_intercepted(struct kvm_vcpu *vcpu, unsigned msr) } static void set_msr_interception(u32 *msrpm, unsigned msr, - int read, int write) + int type, bool value) { u8 bit_read, bit_write; unsigned long tmp; @@ -1097,8 +1097,11 @@ static void set_msr_in...

...y with other attributes of partitions, and not force part_list to use a non-machine output type (which is not really meant for machine parsing). > diff --git a/resize/resize.ml b/resize/resize.ml > index 84fd6d4..8f8f67f 100644 > --- a/resize/resize.ml > +++ b/resize/resize.ml > @@ -1078,7 +1078,7 @@ read the man page virt-resize(1). > *) > p_name = ""; > p_part = { G.part_num = 0l; part_start = 0L; part_end = 0L; > - part_size = 0L }; > + part_size = 0L; part_type = "" }; &...

...changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index 9ee58e2a0eb2..5e1fa176aac4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -1078,7 +1078,6 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp) if (IS_ERR(rpc)) return PTR_ERR(rpc); - rpc->size = sizeof(*rpc); rpc->numEntries = NV_GSP_REG_NUM_ENTRIES; str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]); @@ -1094,6 +1093,7 @@ r535_gsp_rpc_set_re...

...{ kref_put(&ubufs->kref, vhost_net_zerocopy_done_signal); wait_event(ubufs->wait, !atomic_read(&ubufs->kref.refcount)); +} + +static void vhost_net_ubuf_put_wait_and_free(struct vhost_net_ubuf_ref *ubufs) +{ + vhost_net_ubuf_put_and_wait(ubufs); kfree(ubufs); } @@ -1073,7 +1078,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) mutex_unlock(&vq->mutex); if (oldubufs) { - vhost_net_ubuf_put_and_wait(oldubufs); + vhost_net_ubuf_put_wait_and_free(oldubufs); mutex_lock(&vq->mutex); vhost_zerocopy_signal_used(n, vq);...

...{ kref_put(&ubufs->kref, vhost_net_zerocopy_done_signal); wait_event(ubufs->wait, !atomic_read(&ubufs->kref.refcount)); +} + +static void vhost_net_ubuf_put_wait_and_free(struct vhost_net_ubuf_ref *ubufs) +{ + vhost_net_ubuf_put_and_wait(ubufs); kfree(ubufs); } @@ -1073,7 +1078,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) mutex_unlock(&vq->mutex); if (oldubufs) { - vhost_net_ubuf_put_and_wait(oldubufs); + vhost_net_ubuf_put_wait_and_free(oldubufs); mutex_lock(&vq->mutex); vhost_zerocopy_signal_used(n, vq);...

...&evts[i], sizeof(*evts)); + ret = virtqueue_add_inbuf(vq, sg, 1, &evts[i], GFP_KERNEL); + if (ret) + return ret; } - viommu->vq = ret; + if (!virtqueue_kick(vq)) + return -EPIPE; + + dev_info(viommu->dev, "%zu event buffers\n", nr_evts); return 0; } @@ -973,7 +1078,7 @@ static int viommu_probe(struct virtio_device *vdev) viommu->dev = dev; viommu->vdev = vdev; - ret = viommu_init_vq(viommu); + ret = viommu_init_vqs(viommu); if (ret) goto err_free_viommu; @@ -1014,6 +1119,11 @@ static int viommu_probe(struct virtio_device *vdev) virtio_d...

...llocation of evts? Thanks Eric > + if (ret) > + return ret; > } > > - viommu->vq = ret; > + if (!virtqueue_kick(vq)) > + return -EPIPE; > + > + dev_info(viommu->dev, "%zu event buffers\n", nr_evts); > > return 0; > } > @@ -973,7 +1078,7 @@ static int viommu_probe(struct virtio_device *vdev) > viommu->dev = dev; > viommu->vdev = vdev; > > - ret = viommu_init_vq(viommu); > + ret = viommu_init_vqs(viommu); > if (ret) > goto err_free_viommu; > > @@ -1014,6 +1119,11 @@ static int viommu_p...

..._get(input, (char *)&s4_req.dest_port, 2); + buffer_get(input, (char *)&s4_req.dest_addr, 4); + have = buffer_len(input); + p = buffer_ptr(input); len = strlen(p); debug2("channel %d: decode socks4: user %s/%d", c->self, p, len); len++; /* trailing '\0' */ @@ -1078,7 +1092,7 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset) fatal("channel %d: decode socks4: len %d > have %d", c->self, len, have); strlcpy(username, p, sizeof(username)); - buffer_consume(&c->input, len); + buffer_consume(input, len);...

Convert the AMD iommu driver to the dma-iommu api. Remove the iova handling and reserve region code from the AMD iommu driver. Change-log: V4: -Rebase on top of linux-next -Split the removing of the unnecessary locking in the amd iommu driver into a seperate patch -refactor the "iommu/dma-iommu: Handle deferred devices" patch and address comments v3: -rename dma_limit to dma_mask -exit

Convert the AMD iommu driver to the dma-iommu api. Remove the iova handling and reserve region code from the AMD iommu driver. Change-log: V4: -Rebase on top of linux-next -Split the removing of the unnecessary locking in the amd iommu driver into a seperate patch -refactor the "iommu/dma-iommu: Handle deferred devices" patch and address comments v3: -rename dma_limit to dma_mask -exit

...ing revision 1.84 diff -u -r1.84 clientloop.c --- clientloop.c 11 Oct 2001 15:24:00 -0000 1.84 +++ clientloop.c 22 Oct 2001 18:23:38 -0000 @@ -1042,6 +1042,7 @@ quit_pending = 1; } +#ifdef WITH_TCPFWD static Channel * client_request_forwarded_tcpip(const char *request_type, int rchan) { @@ -1078,7 +1079,9 @@ xfree(listen_address); return c; } +#endif /* WITH_TCPFWD */ +#ifdef WITH_X11FWD static Channel* client_request_x11(const char *request_type, int rchan) { @@ -1118,7 +1121,9 @@ c->force_drain = 1; return c; } +#endif /* WITH_X11FWD */ +#ifdef WITH_AGENTFWD static C...

This series is based on [1]: [PATCH v2 00/10] virtio-mem: paravirtualized memory That will hopefull get picked up soon, rebased to -next. The following patches were reverted from -next [2]: [PATCH 0/3] kexec/memory_hotplug: Prevent removal and accidental use As discussed in that thread, they should be reverted from -next already. In theory, if people agree, we could take the first two patches

...queue) { struct meth_private *priv = netdev_priv(dev); unsigned long flags; diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c index c7641a236eb8..88c4844b6caa 100644 --- a/drivers/net/ethernet/silan/sc92031.c +++ b/drivers/net/ethernet/silan/sc92031.c @@ -1078,7 +1078,7 @@ static void sc92031_set_multicast_list(struct net_device *dev) spin_unlock_bh(&priv->lock); } -static void sc92031_tx_timeout(struct net_device *dev) +static void sc92031_tx_timeout(struct net_device *dev, int txqueue) { struct sc92031_priv *priv = netdev_priv(dev); di...