Loading drivers/infiniband/hw/ipath/ipath_file_ops.c +0 −5 Original line number Diff line number Diff line Loading @@ -1050,11 +1050,6 @@ static int mmap_piobufs(struct vm_area_struct *vma, phys = dd->ipath_physaddr + piobufs; /* * Don't mark this as non-cached, or we don't get the * write combining behavior we want on the PIO buffers! */ #if defined(__powerpc__) /* There isn't a generic way to specify writethrough mappings */ pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; Loading drivers/infiniband/hw/ipath/ipath_iba6110.c +2 −1 Original line number Diff line number Diff line Loading @@ -1022,7 +1022,8 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd, do { u8 cap_type; /* the HT capability type byte is 3 bytes after the /* * The HT capability type byte is 3 bytes after the * capability byte. */ if (pci_read_config_byte(pdev, pos + 3, &cap_type)) { Loading drivers/infiniband/hw/ipath/ipath_iba6120.c +1 −1 Original line number Diff line number Diff line Loading @@ -535,7 +535,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg, if (hwerrs & INFINIPATH_HWE_SERDESPLLFAILED) { /* * If it occurs, it is left masked since the eternal * If it occurs, it is left masked since the external * interface is unused */ dd->ipath_hwerrmask &= ~INFINIPATH_HWE_SERDESPLLFAILED; Loading drivers/infiniband/hw/ipath/ipath_keys.c +2 −3 Original line number Diff line number Diff line Loading @@ -128,9 +128,8 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge, int ret; /* * We use LKEY == zero to mean a physical kmalloc() address. * This is a bit of a hack since we rely on dma_map_single() * being reversible by calling bus_to_virt(). * We use LKEY == zero for kernel virtual addresses * (see ipath_get_dma_mr and ipath_dma.c). */ if (sge->lkey == 0) { struct ipath_pd *pd = to_ipd(qp->ibqp.pd); Loading drivers/infiniband/hw/ipath/ipath_verbs.c +5 −2 Original line number Diff line number Diff line Loading @@ -943,7 +943,7 @@ static int ipath_verbs_send_pio(struct ipath_qp *qp, u32 *hdr, u32 hdrwords, * ipath_verbs_send - send a packet * @qp: the QP to send on * @hdr: the packet header * @hdrwords: the number of words in the header * @hdrwords: the number of 32-bit words in the header * @ss: the SGE to send * @len: the length of the packet in bytes */ Loading @@ -955,7 +955,10 @@ int ipath_verbs_send(struct ipath_qp *qp, struct ipath_ib_header *hdr, int ret; u32 dwords = (len + 3) >> 2; /* +1 is for the qword padding of pbc */ /* * Calculate the send buffer trigger address. * The +1 counts for the pbc control dword following the pbc length. */ plen = hdrwords + dwords + 1; /* Drop non-VL15 packets if we are not in the active state */ Loading drivers/infiniband/hw/ipath/ipath_driver.c +1 −1 File changed.Contains only whitespace changes. Show changes Loading
drivers/infiniband/hw/ipath/ipath_file_ops.c +0 −5 Original line number Diff line number Diff line Loading @@ -1050,11 +1050,6 @@ static int mmap_piobufs(struct vm_area_struct *vma, phys = dd->ipath_physaddr + piobufs; /* * Don't mark this as non-cached, or we don't get the * write combining behavior we want on the PIO buffers! */ #if defined(__powerpc__) /* There isn't a generic way to specify writethrough mappings */ pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; Loading
drivers/infiniband/hw/ipath/ipath_iba6110.c +2 −1 Original line number Diff line number Diff line Loading @@ -1022,7 +1022,8 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd, do { u8 cap_type; /* the HT capability type byte is 3 bytes after the /* * The HT capability type byte is 3 bytes after the * capability byte. */ if (pci_read_config_byte(pdev, pos + 3, &cap_type)) { Loading
drivers/infiniband/hw/ipath/ipath_iba6120.c +1 −1 Original line number Diff line number Diff line Loading @@ -535,7 +535,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg, if (hwerrs & INFINIPATH_HWE_SERDESPLLFAILED) { /* * If it occurs, it is left masked since the eternal * If it occurs, it is left masked since the external * interface is unused */ dd->ipath_hwerrmask &= ~INFINIPATH_HWE_SERDESPLLFAILED; Loading
drivers/infiniband/hw/ipath/ipath_keys.c +2 −3 Original line number Diff line number Diff line Loading @@ -128,9 +128,8 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge, int ret; /* * We use LKEY == zero to mean a physical kmalloc() address. * This is a bit of a hack since we rely on dma_map_single() * being reversible by calling bus_to_virt(). * We use LKEY == zero for kernel virtual addresses * (see ipath_get_dma_mr and ipath_dma.c). */ if (sge->lkey == 0) { struct ipath_pd *pd = to_ipd(qp->ibqp.pd); Loading
drivers/infiniband/hw/ipath/ipath_verbs.c +5 −2 Original line number Diff line number Diff line Loading @@ -943,7 +943,7 @@ static int ipath_verbs_send_pio(struct ipath_qp *qp, u32 *hdr, u32 hdrwords, * ipath_verbs_send - send a packet * @qp: the QP to send on * @hdr: the packet header * @hdrwords: the number of words in the header * @hdrwords: the number of 32-bit words in the header * @ss: the SGE to send * @len: the length of the packet in bytes */ Loading @@ -955,7 +955,10 @@ int ipath_verbs_send(struct ipath_qp *qp, struct ipath_ib_header *hdr, int ret; u32 dwords = (len + 3) >> 2; /* +1 is for the qword padding of pbc */ /* * Calculate the send buffer trigger address. * The +1 counts for the pbc control dword following the pbc length. */ plen = hdrwords + dwords + 1; /* Drop non-VL15 packets if we are not in the active state */ Loading
drivers/infiniband/hw/ipath/ipath_driver.c +1 −1 File changed.Contains only whitespace changes. Show changes