Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dcf39c6 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/ipath: Workaround problem of errormask register being overwritten
  IB/ipath: Fix some issues with buffer cancel and sendctrl register update
  IB/ipath: Use faster put_tid_2 routine after initialization
  IB/ipath: Remove unsafe fastrcvint code from interrupt handler
  IB/ehca: Move extern declarations from .c files to .h files
  IB/mlx4: Whitespace fix
  IB/ehca: Fix include order to better match kernel style
  mlx4_core: Remove kfree() in mlx4_mr_alloc() error flow
  RDMA/amso1100: Initialize the wait_queue_head_t in the c2_qp structure
parents af947311 78d1e02f

drivers/infiniband/hw/amso1100/c2_qp.c

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ int c2_alloc_qp(struct c2_dev *c2dev, 
	qp->send_sgl_depth = qp_attrs->cap.max_send_sge;

	qp->rdma_write_sgl_depth = qp_attrs->cap.max_send_sge;

	qp->recv_sgl_depth = qp_attrs->cap.max_recv_sge;

	init_waitqueue_head(&qp->wait);



	/* Initialize the SQ MQ */

	q_size = be32_to_cpu(reply->sq_depth);

drivers/infiniband/hw/ehca/ehca_classes.h

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ extern int ehca_static_rate; 
extern int ehca_port_act_time;

extern int ehca_use_hp_mr;

extern int ehca_scaling_code;

extern int ehca_mr_largepage;



struct ipzu_queue_resp {

	u32 qe_size;      /* queue entry size */

drivers/infiniband/hw/ehca/ehca_mrmw.c

+2 −4
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ 
 * POSSIBILITY OF SUCH DAMAGE.

 */



#include <rdma/ib_umem.h>



#include <asm/current.h>



#include <rdma/ib_umem.h>



#include "ehca_iverbs.h"

#include "ehca_mrmw.h"

#include "hcp_if.h"
@@ -64,8 +64,6 @@ enum ehca_mr_pgsize { 
	EHCA_MR_PGSIZE16M = 0x1000000L

};



extern int ehca_mr_largepage;



static u32 ehca_encode_hwpage_size(u32 pgsize)

{

	u32 idx = 0;

drivers/infiniband/hw/ehca/ehca_pd.c

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ int ehca_dealloc_pd(struct ib_pd *pd) 
	u32 cur_pid = current->tgid;

	struct ehca_pd *my_pd = container_of(pd, struct ehca_pd, ib_pd);

	int i, leftovers = 0;

	extern struct kmem_cache *small_qp_cache;

	struct ipz_small_queue_page *page, *tmp;



	if (my_pd->ib_pd.uobject && my_pd->ib_pd.uobject->context &&

drivers/infiniband/hw/ehca/hcp_if.c

+0 −1
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ u64 hipz_h_register_rpage_mr(const struct ipz_adapter_handle adapter_handle, 
			     const u64 logical_address_of_page,

			     const u64 count)

{

	extern int ehca_debug_level;

	u64 ret;



	if (unlikely(ehca_debug_level >= 2)) {