From ea9a56dc3198669da2e96b8e7c09bb855249f48b Mon Sep 17 00:00:00 2001 From: Glenn Elliott Date: Wed, 20 Feb 2013 20:01:23 -0500 Subject: Fix partitioned C-EDF --- kernel/softirq.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'kernel') 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, void __tasklet_schedule(struct tasklet_struct *t) { -#ifdef CONFIG_LITMUS_NVIDIA +#if defined(CONFIG_LITMUS_NVIDIA) && ( \ + defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ + defined(CONFIG_LITMUS_SOFTIRQD) || \ + defined(CONFIG_LITMUS_PAI_SOFTIRQD)) if(is_nvidia_func(t->func)) { #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) @@ -527,7 +530,10 @@ EXPORT_SYMBOL(___tasklet_schedule); void __tasklet_hi_schedule(struct tasklet_struct *t) { -#ifdef CONFIG_LITMUS_NVIDIA +#if defined(CONFIG_LITMUS_NVIDIA) && ( \ + defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ + defined(CONFIG_LITMUS_SOFTIRQD) || \ + defined(CONFIG_LITMUS_PAI_SOFTIRQD)) if(is_nvidia_func(t->func)) { #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) @@ -568,7 +574,10 @@ EXPORT_SYMBOL(___tasklet_hi_schedule); void __tasklet_hi_schedule_first(struct tasklet_struct *t) { BUG_ON(!irqs_disabled()); -#ifdef CONFIG_LITMUS_NVIDIA +#if defined(CONFIG_LITMUS_NVIDIA) && ( \ + defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) || \ + defined(CONFIG_LITMUS_SOFTIRQD) || \ + defined(CONFIG_LITMUS_PAI_SOFTIRQD)) if(is_nvidia_func(t->func)) { #if defined(CONFIG_LITMUS_NVIDIA_NONSPLIT_INTERRUPTS) -- cgit v1.2.2