aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 7e35d4b9e14a..53f97eb8dbc7 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -440,8 +440,6 @@ struct task_cputime {
440 .sum_exec_runtime = 0, \ 440 .sum_exec_runtime = 0, \
441 } 441 }
442 442
443#define PREEMPT_ENABLED (PREEMPT_NEED_RESCHED)
444
445#ifdef CONFIG_PREEMPT_COUNT 443#ifdef CONFIG_PREEMPT_COUNT
446#define PREEMPT_DISABLED (1 + PREEMPT_ENABLED) 444#define PREEMPT_DISABLED (1 + PREEMPT_ENABLED)
447#else 445#else
@@ -831,8 +829,6 @@ struct sched_domain {
831 unsigned int balance_interval; /* initialise to 1. units in ms. */ 829 unsigned int balance_interval; /* initialise to 1. units in ms. */
832 unsigned int nr_balance_failed; /* initialise to 0 */ 830 unsigned int nr_balance_failed; /* initialise to 0 */
833 831
834 u64 last_update;
835
836 /* idle_balance() stats */ 832 /* idle_balance() stats */
837 u64 max_newidle_lb_cost; 833 u64 max_newidle_lb_cost;
838 unsigned long next_decay_max_lb_cost; 834 unsigned long next_decay_max_lb_cost;
@@ -934,7 +930,8 @@ struct pipe_inode_info;
934struct uts_namespace; 930struct uts_namespace;
935 931
936struct load_weight { 932struct load_weight {
937 unsigned long weight, inv_weight; 933 unsigned long weight;
934 u32 inv_weight;
938}; 935};
939 936
940struct sched_avg { 937struct sched_avg {