1 files changed, 6 insertions, 14 deletions

diff --git a/litmus/Kconfig b/litmus/Kconfig
index f2434b87239b..9aeae659ae32 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -382,7 +382,7 @@ menu "Interrupt Handling"
 choice 
         prompt "Scheduling of interrupt bottom-halves in Litmus."
         default LITMUS_SOFTIRQD_NONE
-        depends on LITMUS_LOCKING && !LITMUS_THREAD_ALL_SOFTIRQ
+        depends on LITMUS_LOCKING
         help
                 Schedule tasklets with known priorities in Litmus.
 
@@ -398,7 +398,7 @@ config LITMUS_SOFTIRQD
           specifically dispatched to these workers.  (Softirqs for
           Litmus tasks are not magically redirected to klmirqd.)
 
-          G-EDF/RM, C-EDF/RM ONLY for now!
+          G-EDF, C-EDF ONLY for now!
 
 
 config LITMUS_PAI_SOFTIRQD
@@ -409,19 +409,11 @@ config LITMUS_PAI_SOFTIRQD
           at the cost of non-preemptive durations of bottom half
           processing.
                  
-          G-EDF/RM, C-EDF/RM ONLY for now!       
+          G-EDF, C-EDF ONLY for now!     
                  
 endchoice          
            
 
-config NR_LITMUS_SOFTIRQD
-           int "Number of klmirqd."
-           depends on LITMUS_SOFTIRQD
-           range 1 4096
-           default "1"
-           help
-             Should be <= to the number of CPUs in your system.
-
 config LITMUS_NVIDIA
           bool "Litmus handling of NVIDIA interrupts."
           default n
@@ -445,7 +437,7 @@ config LITMUS_AFFINITY_AWARE_GPU_ASSINGMENT
 config NV_DEVICE_NUM
            int "Number of NVIDIA GPUs."
            depends on LITMUS_SOFTIRQD || LITMUS_PAI_SOFTIRQD
-           range 1 4096
+           range 1 16
            default "1"
            help
              Should be (<= to the number of CPUs) and
@@ -453,11 +445,11 @@ config NV_DEVICE_NUM
 
 config NV_MAX_SIMULT_USERS
         int "Maximum number of threads sharing a GPU simultanously"
-        depends on LITMUS_SOFTIRQD || LITMUS_PAI_SOFTIRQD
+        depends on LITMUS_NVIDIA
         range 1 3
         default "2"
         help
-                Should be equal to the #copy_engines + #execution_engines
+                Should be at least equal to the #copy_engines + #execution_engines
                 of the GPUs in your system.
 
                 Scientific/Professional GPUs = 3  (ex. M2070, Quadro 6000?)