diff options
| author | Sebastian Sanchez | 2015-12-11 14:44:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-12-21 23:00:17 +0100 |
| commit | 2ce6bf2292742e0a4e71f08717ce314ce6332151 (patch) | |
| tree | 38ffdcfaa9b1b344b566f37173402dcc1dafa14c /drivers/staging/rdma/hfi1/chip.c | |
| parent | staging/rdma/hfi1: Fix for module parameter hdrq_entsize when it's 0 (diff) | |
| download | kernel-qcow2-linux-2ce6bf2292742e0a4e71f08717ce314ce6332151.tar.gz kernel-qcow2-linux-2ce6bf2292742e0a4e71f08717ce314ce6332151.tar.xz kernel-qcow2-linux-2ce6bf2292742e0a4e71f08717ce314ce6332151.zip | |
staging/rdma/hfi1: Change num_rcv_contexts to num_user_contexts and its meaning
num_rcv_contexts sets the number of user contexts, both receive and send.
Renaming it to num_user_contexts makes sense to reflect its true meaning.
When num_rcv_contexts is 0, the default behavior is the number of CPU
cores instead of 0 contexts. This commit changes the variable
num_rcv_contexts to num_user_contexts, and it also makes any negative
value for this variable default to the number of CPU cores, so if
num_user_contexts is set >= 0, the value will number of contexts.
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rdma/hfi1/chip.c')
| -rw-r--r-- | drivers/staging/rdma/hfi1/chip.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c index 371f13fec68d..ec4bac00dbda 100644 --- a/drivers/staging/rdma/hfi1/chip.c +++ b/drivers/staging/rdma/hfi1/chip.c @@ -12426,7 +12426,6 @@ fail: static int set_up_context_variables(struct hfi1_devdata *dd) { int num_kernel_contexts; - int num_user_contexts; int total_contexts; int ret; unsigned ngroups; @@ -12463,12 +12462,10 @@ static int set_up_context_variables(struct hfi1_devdata *dd) } /* * User contexts: (to be fixed later) - * - set to num_rcv_contexts if non-zero - * - default to 1 user context per CPU + * - default to 1 user context per CPU if num_user_contexts is + * negative */ - if (num_rcv_contexts) - num_user_contexts = num_rcv_contexts; - else + if (num_user_contexts < 0) num_user_contexts = num_online_cpus(); total_contexts = num_kernel_contexts + num_user_contexts; |