From 875c9c4a8ea53228349137a17e55827b3ec9cee5 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 9 Jul 2007 18:52:00 +0200 Subject: [PATCH] --- yaml --- r: 58293 b: refs/heads/master c: 50e645a8a1a91f57dd5d8454620be5f1cb0fc089 h: refs/heads/master i: 58291: bf39825ce9dd42f65ce42872d15e7c47e9ffb482 v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 82f6714c96aa..c528395c5493 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 634fa8c97cc8f4ee2ae1dea7200ff0df762405e7 +refs/heads/master: 50e645a8a1a91f57dd5d8454620be5f1cb0fc089 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index ce0c5adc9eb0..efa3beb007ff 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -788,7 +788,6 @@ struct mempolicy; struct pipe_inode_info; struct uts_namespace; -struct prio_array; struct rq; struct sched_domain; @@ -884,10 +883,9 @@ struct task_struct { int oncpu; #endif #endif - int load_weight; /* for niceness load balancing purposes */ + int prio, static_prio, normal_prio; struct list_head run_list; - struct prio_array *array; struct sched_class *sched_class; struct sched_entity se; @@ -895,13 +893,10 @@ struct task_struct { #ifdef CONFIG_BLK_DEV_IO_TRACE unsigned int btrace_seq; #endif - unsigned long sleep_avg; - unsigned long long timestamp, last_ran; - unsigned long long sched_time; /* sched_clock time spent running */ unsigned int policy; cpumask_t cpus_allowed; - unsigned int time_slice, first_time_slice; + unsigned int time_slice; #if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) struct sched_info sched_info;