From c1cda76c0cfb184ab241c5fbde66f7ca92da8e79 Mon Sep 17 00:00:00 2001 From: Glenn Elliott Date: Fri, 18 Jan 2013 11:00:14 -0500 Subject: Remove tasklet::owner field (just commented out). --- include/linux/interrupt.h | 3 ++- kernel/softirq.c | 2 ++ litmus/litmus_softirq.c | 12 ++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 9fc31289a1bb..af52b5c497b9 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -501,10 +501,11 @@ struct tasklet_struct atomic_t count; void (*func)(unsigned long); unsigned long data; - +#if 0 #if defined(CONFIG_LITMUS_SOFTIRQD) || defined(CONFIG_LITMUS_PAI_SOFTIRQD) struct task_struct *owner; #endif +#endif }; struct tasklet_head diff --git a/kernel/softirq.c b/kernel/softirq.c index b56b35452d0d..4b55daafbbea 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -663,9 +663,11 @@ void tasklet_init(struct tasklet_struct *t, t->func = func; t->data = data; +#if 0 #ifdef CONFIG_LITMUS_SOFTIRQD t->owner = NULL; #endif +#endif } EXPORT_SYMBOL(tasklet_init); diff --git a/litmus/litmus_softirq.c b/litmus/litmus_softirq.c index 666ea7ed1cb1..a5d61afe7952 100644 --- a/litmus/litmus_softirq.c +++ b/litmus/litmus_softirq.c @@ -255,7 +255,7 @@ int launch_klmirqd_thread(char* name, int cpu, klmirqd_callback_t* cb) -#define KLMIRQD_SLICE_NR_JIFFIES 1 +#define KLMIRQD_SLICE_NR_JIFFIES 4 #define KLMIRQD_SLICE_NS ((NSEC_PER_SEC / HZ) * KLMIRQD_SLICE_NR_JIFFIES) static int become_litmus_daemon(struct task_struct* tsk) @@ -263,7 +263,7 @@ static int become_litmus_daemon(struct task_struct* tsk) int ret = 0; struct rt_task tp = { - .period = KLMIRQD_SLICE_NS, /* dummy 1 second period */ + .period = KLMIRQD_SLICE_NS, .relative_deadline = KLMIRQD_SLICE_NS, .exec_cost = KLMIRQD_SLICE_NS, .phase = 0, @@ -607,7 +607,7 @@ static void do_lit_tasklet(struct klmirqd_info* which, if (tasklet_trylock(t)) { if (!atomic_read(&t->count)) { - sched_trace_tasklet_begin(t->owner); + sched_trace_tasklet_begin(NULL); if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state)) { @@ -619,7 +619,7 @@ static void do_lit_tasklet(struct klmirqd_info* which, atomic_dec(count); - sched_trace_tasklet_end(t->owner, 0ul); + sched_trace_tasklet_end(NULL, 0ul); continue; /* process more tasklets */ } @@ -883,7 +883,7 @@ void flush_pending(struct task_struct* tsk) work_flushed |= LIT_TASKLET_HI; - t->owner = NULL; +// t->owner = NULL; // WTF? if(!test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) @@ -923,7 +923,7 @@ void flush_pending(struct task_struct* tsk) work_flushed |= LIT_TASKLET_LOW; - t->owner = NULL; +// t->owner = NULL; // sched_trace_tasklet_end(owner, 1ul); if(!test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) -- cgit v1.2.2