Commit 30c083c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/core: Remove IB_DEVICE_SEND_W_INV capability flag
  IB/umem: Avoid sign problems when demoting npages to integer
parents 849bf20e 4c0283fc

drivers/infiniband/core/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, 
	ret = 0;

	while (npages) {

		ret = get_user_pages(current, current->mm, cur_base,

				     min_t(int, npages,

				     min_t(unsigned long, npages,

					   PAGE_SIZE / sizeof (struct page *)),

				     1, !umem->writable, page_list, vma_list);

drivers/infiniband/hw/amso1100/c2_rnic.c

+1 −2
Original line number Diff line number Diff line
@@ -455,8 +455,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev) 
	     IB_DEVICE_CURR_QP_STATE_MOD |

	     IB_DEVICE_SYS_IMAGE_GUID |

	     IB_DEVICE_ZERO_STAG |

	     IB_DEVICE_MEM_WINDOW |

	     IB_DEVICE_SEND_W_INV);

	     IB_DEVICE_MEM_WINDOW);



	/* Allocate the qptr_array */

	c2dev->qptr_array = vmalloc(C2_MAX_CQS * sizeof(void *));

include/rdma/ib_verbs.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ enum ib_device_cap_flags { 
	 */

	IB_DEVICE_UD_IP_CSUM		= (1<<18),

	IB_DEVICE_UD_TSO		= (1<<19),

	IB_DEVICE_SEND_W_INV		= (1<<21),

};



enum ib_atomic_cap {