aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/softirq.c1
-rw-r--r--kernel/workqueue.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index d3217c54d2bf..7a6f500570f1 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -439,6 +439,7 @@ void __tasklet_schedule(struct tasklet_struct *t)
439 439
440 t->owner = device_owner; 440 t->owner = device_owner;
441 sched_trace_tasklet_release(t->owner); 441 sched_trace_tasklet_release(t->owner);
442
442 if(likely(_litmus_tasklet_schedule(t,nvidia_device))) 443 if(likely(_litmus_tasklet_schedule(t,nvidia_device)))
443 { 444 {
444 unlock_nv_registry(nvidia_device, &flags); 445 unlock_nv_registry(nvidia_device, &flags);
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 637cadac2627..2293aadbb1ab 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2531,6 +2531,7 @@ EXPORT_SYMBOL(cancel_delayed_work_sync);
2531 */ 2531 */
2532int schedule_work(struct work_struct *work) 2532int schedule_work(struct work_struct *work)
2533{ 2533{
2534#if 0
2534#if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD) 2535#if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD)
2535 if(is_nvidia_func(work->func)) 2536 if(is_nvidia_func(work->func))
2536 { 2537 {
@@ -2583,7 +2584,7 @@ int schedule_work(struct work_struct *work)
2583 unlock_nv_registry(nvidiaDevice, &flags); 2584 unlock_nv_registry(nvidiaDevice, &flags);
2584 } 2585 }
2585#endif 2586#endif
2586 2587#endif
2587 return(__schedule_work(work)); 2588 return(__schedule_work(work));
2588} 2589}
2589EXPORT_SYMBOL(schedule_work); 2590EXPORT_SYMBOL(schedule_work);