diff options
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 561d60ce1f65..fb2947ed6e51 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -487,8 +487,7 @@ void __tasklet_schedule(struct tasklet_struct *t) | |||
487 | { | 487 | { |
488 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ | 488 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ |
489 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ | 489 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ |
490 | defined(CONFIG_LITMUS_SOFTIRQD) || \ | 490 | defined(CONFIG_LITMUS_SOFTIRQD)) \ |
491 | defined(CONFIG_LITMUS_PAI_SOFTIRQD)) | ||
492 | if(is_nvidia_func(t->func)) | 491 | if(is_nvidia_func(t->func)) |
493 | { | 492 | { |
494 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) | 493 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) |
@@ -502,8 +501,6 @@ void __tasklet_schedule(struct tasklet_struct *t) | |||
502 | return; | 501 | return; |
503 | else | 502 | else |
504 | goto default_linux_handling; | 503 | goto default_linux_handling; |
505 | #elif defined(CONFIG_LITMUS_PAI_SOFTIRQD) | ||
506 | /* broken at the moment! */ | ||
507 | #endif | 504 | #endif |
508 | } | 505 | } |
509 | 506 | ||
@@ -532,8 +529,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t) | |||
532 | { | 529 | { |
533 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ | 530 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ |
534 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ | 531 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ |
535 | defined(CONFIG_LITMUS_SOFTIRQD) || \ | 532 | defined(CONFIG_LITMUS_SOFTIRQD)) \ |
536 | defined(CONFIG_LITMUS_PAI_SOFTIRQD)) | ||
537 | if(is_nvidia_func(t->func)) | 533 | if(is_nvidia_func(t->func)) |
538 | { | 534 | { |
539 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) | 535 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) |
@@ -547,8 +543,6 @@ void __tasklet_hi_schedule(struct tasklet_struct *t) | |||
547 | return; | 543 | return; |
548 | else | 544 | else |
549 | goto default_linux_handling; | 545 | goto default_linux_handling; |
550 | #elif defined(CONFIG_LITMUS_PAI_SOFTIRQD) | ||
551 | /* broken at the moment! */ | ||
552 | #endif | 546 | #endif |
553 | } | 547 | } |
554 | 548 | ||
@@ -576,8 +570,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) | |||
576 | BUG_ON(!irqs_disabled()); | 570 | BUG_ON(!irqs_disabled()); |
577 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ | 571 | #if defined(CONFIG_LITMUS_NVIDIA) && ( \ |
578 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ | 572 | defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ |
579 | defined(CONFIG_LITMUS_SOFTIRQD) || \ | 573 | defined(CONFIG_LITMUS_SOFTIRQD)) \ |
580 | defined(CONFIG_LITMUS_PAI_SOFTIRQD)) | ||
581 | if(is_nvidia_func(t->func)) | 574 | if(is_nvidia_func(t->func)) |
582 | { | 575 | { |
583 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) | 576 | #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) |
@@ -589,9 +582,6 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) | |||
589 | return; | 582 | return; |
590 | else | 583 | else |
591 | goto default_linux_handling; | 584 | goto default_linux_handling; |
592 | #elif defined(CONFIG_LITMUS_PAI_SOFTIRQD) | ||
593 | /* broken at the moment! */ | ||
594 | #endif | ||
595 | } | 585 | } |
596 | 586 | ||
597 | default_linux_handling: | 587 | default_linux_handling: |