diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2013-02-20 20:01:23 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2013-02-20 20:01:23 -0500 |
commit | ea9a56dc3198669da2e96b8e7c09bb855249f48b (patch) | |
tree | c5938786114ad30bc4aa0e945c7b013c85641f06 /kernel | |
parent | 6987dcbc8945509db8a11d0408a9e2cc5036cbce (diff) |
Fix partitioned C-EDF
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/softirq.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index ef70dbe92a97..9c20a9ec06b2 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -485,7 +485,10 @@ static int __klmirqd_nv_tasklet_schedule(struct tasklet_struct *t, | |||
485 | 485 | ||
486 | void __tasklet_schedule(struct tasklet_struct *t) | 486 | void __tasklet_schedule(struct tasklet_struct *t) |
487 | { | 487 | { |
488 | #ifdef CONFIG_LITMUS_NVIDIA | 488 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ |
489 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ | ||
490 | defined(CONFIG_LITMUS_SOFTIRQD) || \ | ||
491 | defined(CONFIG_LITMUS_PAI_SOFTIRQD)) | ||
489 | if(is_nvidia_func(t->func)) | 492 | if(is_nvidia_func(t->func)) |
490 | { | 493 | { |
491 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) | 494 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) |
@@ -527,7 +530,10 @@ EXPORT_SYMBOL(___tasklet_schedule); | |||
527 | 530 | ||
528 | void __tasklet_hi_schedule(struct tasklet_struct *t) | 531 | void __tasklet_hi_schedule(struct tasklet_struct *t) |
529 | { | 532 | { |
530 | #ifdef CONFIG_LITMUS_NVIDIA | 533 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ |
534 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ | ||
535 | defined(CONFIG_LITMUS_SOFTIRQD) || \ | ||
536 | defined(CONFIG_LITMUS_PAI_SOFTIRQD)) | ||
531 | if(is_nvidia_func(t->func)) | 537 | if(is_nvidia_func(t->func)) |
532 | { | 538 | { |
533 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) | 539 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) |
@@ -568,7 +574,10 @@ EXPORT_SYMBOL(___tasklet_hi_schedule); | |||
568 | void __tasklet_hi_schedule_first(struct tasklet_struct *t) | 574 | void __tasklet_hi_schedule_first(struct tasklet_struct *t) |
569 | { | 575 | { |
570 | BUG_ON(!irqs_disabled()); | 576 | BUG_ON(!irqs_disabled()); |
571 | #ifdef CONFIG_LITMUS_NVIDIA | 577 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ |
578 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ | ||
579 | defined(CONFIG_LITMUS_SOFTIRQD) || \ | ||
580 | defined(CONFIG_LITMUS_PAI_SOFTIRQD)) | ||
572 | if(is_nvidia_func(t->func)) | 581 | if(is_nvidia_func(t->func)) |
573 | { | 582 | { |
574 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) | 583 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) |