aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/sgi-gru/grukservices.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/sgi-gru/grukservices.c')
-rw-r--r--drivers/misc/sgi-gru/grukservices.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 234d165fb11e..dfd49af0fe18 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -638,11 +638,11 @@ int gru_kservices_init(struct gru_state *gru)
638 cpus_possible = uv_blade_nr_possible_cpus(gru->gs_blade_id); 638 cpus_possible = uv_blade_nr_possible_cpus(gru->gs_blade_id);
639 639
640 num = GRU_NUM_KERNEL_CBR * cpus_possible; 640 num = GRU_NUM_KERNEL_CBR * cpus_possible;
641 cbr_map = reserve_gru_cb_resources(gru, GRU_CB_COUNT_TO_AU(num), NULL); 641 cbr_map = gru_reserve_cb_resources(gru, GRU_CB_COUNT_TO_AU(num), NULL);
642 gru->gs_reserved_cbrs += num; 642 gru->gs_reserved_cbrs += num;
643 643
644 num = GRU_NUM_KERNEL_DSR_BYTES * cpus_possible; 644 num = GRU_NUM_KERNEL_DSR_BYTES * cpus_possible;
645 dsr_map = reserve_gru_ds_resources(gru, GRU_DS_BYTES_TO_AU(num), NULL); 645 dsr_map = gru_reserve_ds_resources(gru, GRU_DS_BYTES_TO_AU(num), NULL);
646 gru->gs_reserved_dsr_bytes += num; 646 gru->gs_reserved_dsr_bytes += num;
647 647
648 gru->gs_active_contexts++; 648 gru->gs_active_contexts++;
@@ -673,7 +673,7 @@ int gru_kservices_init(struct gru_state *gru)
673 } 673 }
674 unlock_cch_handle(cch); 674 unlock_cch_handle(cch);
675 675
676 if (options & GRU_QUICKLOOK) 676 if (gru_options & GRU_QUICKLOOK)
677 quicktest(gru); 677 quicktest(gru);
678 return 0; 678 return 0;
679} 679}