tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 30c083c3 849bf20e

+2 -4
unified split
+1 -1
drivers/infiniband/core/umem.c
··· 150 ret = 0; 151 while (npages) { 152 ret = get_user_pages(current, current->mm, cur_base, 153 - min_t(int, npages, 154 PAGE_SIZE / sizeof (struct page *)), 155 1, !umem->writable, page_list, vma_list); 156
··· 150 ret = 0; 151 while (npages) { 152 ret = get_user_pages(current, current->mm, cur_base, 153 + min_t(unsigned long, npages, 154 PAGE_SIZE / sizeof (struct page *)), 155 1, !umem->writable, page_list, vma_list); 156
+1 -2
drivers/infiniband/hw/amso1100/c2_rnic.c
··· 455 IB_DEVICE_CURR_QP_STATE_MOD | 456 IB_DEVICE_SYS_IMAGE_GUID | 457 IB_DEVICE_ZERO_STAG | 458 - IB_DEVICE_MEM_WINDOW | 459 - IB_DEVICE_SEND_W_INV); 460 461 /* Allocate the qptr_array */ 462 c2dev->qptr_array = vmalloc(C2_MAX_CQS * sizeof(void *));
··· 455 IB_DEVICE_CURR_QP_STATE_MOD | 456 IB_DEVICE_SYS_IMAGE_GUID | 457 IB_DEVICE_ZERO_STAG | 458 + IB_DEVICE_MEM_WINDOW); 459 460 /* Allocate the qptr_array */ 461 c2dev->qptr_array = vmalloc(C2_MAX_CQS * sizeof(void *));
-1
include/rdma/ib_verbs.h
··· 105 */ 106 IB_DEVICE_UD_IP_CSUM = (1<<18), 107 IB_DEVICE_UD_TSO = (1<<19), 108 - IB_DEVICE_SEND_W_INV = (1<<21), 109 }; 110 111 enum ib_atomic_cap {
··· 105 */ 106 IB_DEVICE_UD_IP_CSUM = (1<<18), 107 IB_DEVICE_UD_TSO = (1<<19), 108 }; 109 110 enum ib_atomic_cap {