scheduler changes for v3.11
Subsystems (9)
Linus,
Please pull the latest sched-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-core-for-linus
HEAD: 2fd1b487884310d0aa0c0640179dc7490ad86313 Merge tag 'v3.10' into sched/core
The main changes:
- load-calculation cleanups and improvements, by Alex Shi
- various nohz related tidying up of statisics, by Frederic Weisbecker
- factor out /proc functions to kernel/sched/proc.c, by Paul Gortmaker
- simplify the RT policy scheduler, by Kirill Tkhai
- various fixes and cleanups
Thanks,
Ingo
------------------>
Alex Shi (13):
Revert "sched: Introduce temporary FAIR_GROUP_SCHED dependency for load-tracking"
sched: Move a few runnable tg variables into CONFIG_SMP
sched: Set an initial value of runnable avg for new forked task
sched: Fix sleep time double accounting in enqueue entity
sched: Update cpu load after task_tick
sched: Compute runnable load avg in cpu_load and cpu_avg_load_per_task
sched: Consider runnable load average in move_tasks()
sched: Change cfs_rq load avg to unsigned long
sched/tg: Use 'unsigned long' for load variable in task group sched/cfs_rq: Change atomic64_t removed_load to atomic_long_t sched/tg: Remove tg.load_weight
sched: Change get_rq_runnable_load() to static and inline sched/debug: Remove CONFIG_FAIR_GROUP_SCHED mask
Frederic Weisbecker (5):
sched: Update rq clock before migrating tasks out of dying CPU
sched: Update rq clock before setting fair group shares
sched: Update rq clock before calling check_preempt_curr()
sched: Update rq clock earlier in unthrottle_cfs_rq
sched: Use an accessor to read the rq clock
Gerald Schaefer (1):
sched/autogroup: Fix race with task_groups list
Joe Perches (1):
sched: Don't mix use of typedef ctl_table and struct ctl_table
Kamalesh Babulal (5):
sched/fair: Remove unused variable from expire_cfs_rq_runtime() sched/debug: Add load-tracking statistics to task sched/fair: Fix typo describing flags in enqueue_entity
sched: Fix typo in struct sched_avg member description sched/debug: Fix formatting of /proc/<PID>/sched
Kirill Tkhai (1):
sched/rt: Simplify pull_rt_task() logic and remove .leaf_rt_rq_list
Michael Wang (2):
sched: Refine the code in unthrottle_cfs_rq()
sched: Femove the useless declaration in kernel/sched/fair.c
Nathan Zimmer (1):
sched: Use this_rq() helper
Neil Zhang (1):
sched: Remove redundant update_runtime notifier
Paul Gortmaker (2):
sched: Factor out load calculation code from sched/core.c --> sched/proc.c
sched: Move update_load_*() methods from sched.h to fair.c
Stanislaw Gruszka (1):
sched: Use swap() macro in scale_stime()
Viresh Kumar (9):
sched: Rename sched.c as sched/core.c in comments and Documentation
sched: Remove unused params of build_sched_domain()
sched: Optimize build_sched_domains() for saving first SD node for a cpu
sched: Don't initialize alloc_state in build_sched_domains()
sched: Don't set sd->child to NULL when it is already NULL
sched: Create for_each_sd_topology()
sched: Use cached value of span instead of calling sched_domain_span()
sched: Fix memory leakage in build_sched_groups()
sched: Remove WARN_ON(!sd) from init_sched_groups_power()
Documentation/cgroups/cpusets.txt | 2 +- Documentation/rt-mutex-design.txt | 2 +- Documentation/scheduler/sched-domains.txt | 4 +- Documentation/spinlocks.txt | 2 +- Documentation/virtual/uml/UserModeLinux-HOWTO.txt | 4 +- arch/avr32/kernel/process.c | 2 +- arch/cris/include/arch-v10/arch/bitops.h | 2 +- arch/ia64/kernel/head.S | 2 +- arch/mips/kernel/mips-mt-fpaff.c | 4 +- arch/mips/kernel/scall32-o32.S | 5 +- arch/powerpc/include/asm/mmu_context.h | 2 +- arch/tile/include/asm/processor.h | 2 +- arch/tile/kernel/stack.c | 2 +- arch/um/kernel/sysrq.c | 2 +- include/linux/completion.h | 2 +- include/linux/perf_event.h | 2 +- include/linux/sched.h | 9 +- include/linux/spinlock_up.h | 2 +- include/uapi/asm-generic/unistd.h | 2 +- kernel/cpuset.c | 4 +- kernel/sched/Makefile | 2 +- kernel/sched/auto_group.c | 3 +- kernel/sched/core.c | 637 ++-------------------- kernel/sched/cputime.c | 5 +- kernel/sched/debug.c | 37 +- kernel/sched/fair.c | 175 +++--- kernel/sched/proc.c | 591 ++++++++++++++++++++ kernel/sched/rt.c | 132 +---- kernel/sched/sched.h | 71 +-- kernel/sched/stats.h | 8 +- kernel/sched/stop_task.c | 8 +- kernel/time.c | 2 +- kernel/workqueue_internal.h | 2 +- 33 files changed, 844 insertions(+), 887 deletions(-) create mode 100644 kernel/sched/proc.c
Documentation/cgroups/cpusets.txt +1 -1
@@ -373,7 +373,7 @@ can become very uneven. 1.7 What is sched_load_balance ? -------------------------------- -The kernel scheduler (kernel/sched.c) automatically load balances +The kernel scheduler (kernel/sched/core.c) automatically load balances tasks. If one CPU is underutilized, kernel code running on that CPU will look for tasks on other more overloaded CPUs and move those tasks to itself, within the constraints of such placement mechanisms
Documentation/rt-mutex-design.txt +1 -1
@@ -384,7 +384,7 @@ priority back. __rt_mutex_adjust_prio examines the result of rt_mutex_getprio, and if the result does not equal the task's current priority, then rt_mutex_setprio is called to adjust the priority of the task to the new priority. -Note that rt_mutex_setprio is defined in kernel/sched.c to implement the +Note that rt_mutex_setprio is defined in kernel/sched/core.c to implement the actual change in priority. It is interesting to note that __rt_mutex_adjust_prio can either increase
Documentation/scheduler/sched-domains.txt +2 -2
@@ -25,7 +25,7 @@ is treated as one entity. The load of a group is defined as the sum of the load of each of its member CPUs, and only when the load of a group becomes out of balance are tasks moved between groups. -In kernel/sched.c, trigger_load_balance() is run periodically on each CPU +In kernel/sched/core.c, trigger_load_balance() is run periodically on each CPU through scheduler_tick(). It raises a softirq after the next regularly scheduled rebalancing event for the current runqueue has arrived. The actual load balancing workhorse, run_rebalance_domains()->rebalance_domains(), is then run
@@ -62,7 +62,7 @@ struct sched_domain fields, SD_FLAG_*, SD_*_INIT to get an idea of the specifics and what to tune. Architectures may retain the regular override the default SD_*_INIT flags -while using the generic domain builder in kernel/sched.c if they wish to +while using the generic domain builder in kernel/sched/core.c if they wish to retain the traditional SMT->SMP->NUMA topology (or some subset of that). This can be done by #define'ing ARCH_HASH_SCHED_TUNE.
Documentation/spinlocks.txt +1 -1
@@ -137,7 +137,7 @@ don't block on each other (and thus there is no dead-lock wrt interrupts. But when you do the write-lock, you have to use the irq-safe version. For an example of being clever with rw-locks, see the "waitqueue_lock" -handling in kernel/sched.c - nothing ever _changes_ a wait-queue from +handling in kernel/sched/core.c - nothing ever _changes_ a wait-queue from within an interrupt, they only read the queue in order to know whom to wake up. So read-locks are safe (which is good: they are very common indeed), while write-locks need to protect themselves against interrupts.
Documentation/virtual/uml/UserModeLinux-HOWTO.txt +2 -2
@@ -3127,7 +3127,7 @@ at process_kern.c:156 #3 0x1006a052 in switch_to (prev=0x50072000, next=0x507e8000, last=0x50072000) at process_kern.c:161 - #4 0x10001d12 in schedule () at sched.c:777 + #4 0x10001d12 in schedule () at core.c:777 #5 0x1006a744 in __down (sem=0x507d241c) at semaphore.c:71 #6 0x1006aa10 in __down_failed () at semaphore.c:157 #7 0x1006c5d8 in segv_handler (sc=0x5006e940) at trap_user.c:174
@@ -3191,7 +3191,7 @@ at process_kern.c:161 161 _switch_to(prev, next); (gdb) - #4 0x10001d12 in schedule () at sched.c:777 + #4 0x10001d12 in schedule () at core.c:777 777 switch_to(prev, next, prev); (gdb) #5 0x1006a744 in __down (sem=0x507d241c) at semaphore.c:71
arch/avr32/kernel/process.c +1 -1
@@ -341,7 +341,7 @@ unsigned long get_wchan(struct task_struct *p)* is actually quite ugly. It might be possible to * determine the frame size automatically at build * time by doing this: -* - compile sched.c +* - compile sched/core.c * - disassemble the resulting sched.o * - look for 'sub sp,??' shortly after '<schedule>:' */
arch/cris/include/arch-v10/arch/bitops.h +1 -1
@@ -17,7 +17,7 @@ static inline unsigned long cris_swapnwbrlz(unsigned long w)in another register: ! __asm__ ("swapnwbr %2\n\tlz %2,%0" ! : "=r,r" (res), "=r,X" (dummy) : "1,0" (w)); -confuses gcc (sched.c, gcc from cris-dist-1.14). */ +confuses gcc (core.c, gcc from cris-dist-1.14). */ unsigned long res; __asm__ ("swapnwbr %0 \n\t"
arch/ia64/kernel/head.S +1 -1
@@ -1035,7 +1035,7 @@ END(ia64_delay_loop) * Return a CPU-local timestamp in nano-seconds. This timestamp is * NOT synchronized across CPUs its return value must never be * compared against the values returned on another CPU. The usage in - * kernel/sched.c ensures that. + * kernel/sched/core.c ensures that. * * The return-value of sched_clock() is NOT supposed to wrap-around. * If it did, it would cause some scheduling hiccups (at the worst).
arch/mips/kernel/mips-mt-fpaff.c +2 -2
@@ -27,12 +27,12 @@ unsigned long mt_fpemul_threshold;* FPU affinity with the user's requested processor affinity. * This code is 98% identical with the sys_sched_setaffinity() * and sys_sched_getaffinity() system calls, and should be -* updated when kernel/sched.c changes. +* updated when kernel/sched/core.c changes. */ /* * find_process_by_pid - find a process with a matching PID value. -* used in sys_sched_set/getaffinity() in kernel/sched.c, so +* used in sys_sched_set/getaffinity() in kernel/sched/core.c, so * cloned here. */ static inline struct task_struct *find_process_by_pid (pid_t pid)
arch/mips/kernel/scall32-o32.S +3 -2
@@ -476,8 +476,9 @@ einval: li v0, -ENOSYS /* * For FPU affinity scheduling on MIPS MT processors, we need to * intercept sys_sched_xxxaffinity() calls until we get a proper hook - * in kernel/sched.c. Considered only temporary we only support these - * hooks for the 32-bit kernel - there is no MIPS64 MT processor atm. + * in kernel/sched/core.c. Considered only temporary we only support + * these hooks for the 32-bit kernel - there is no MIPS64 MT processor + * atm. */ sys mipsmt_sys_sched_setaffinity 3 sys mipsmt_sys_sched_getaffinity 3
arch/powerpc/include/asm/mmu_context.h +1 -1
@@ -38,7 +38,7 @@ extern void drop_cop(unsigned long acop, struct mm_struct *mm);/* * switch_mm is the entry point called from the architecture independent -* code in kernel/sched.c +* code in kernel/sched/core.c */ static inline void switch_mm (struct mm_struct *prev,struct mm_struct *next,struct task_struct *tsk)
arch/tile/include/asm/processor.h +1 -1
@@ -225,7 +225,7 @@ extern int do_work_pending(struct pt_regs *regs, u32 flags);/* * Return saved (kernel) PC of a blocked thread. -* Only used in a printk() in kernel/sched.c, so don't work too hard. +* Only used in a printk() in kernel/sched/core.c, so don't work too hard. */ #define thread_saved_pc (t) ((t)->thread.pc)
arch/tile/kernel/stack.c +1 -1
@@ -442,7 +442,7 @@ void _KBacktraceIterator_init_current(struct KBacktraceIterator *kbt, ulong pc, regs_to_pt_regs(®s, pc, lr, sp, r52)); } -/* This is called only from kernel/sched.c, with esp == NULL */ +/* This is called only from kernel/sched/core.c, with esp == NULL */ void show_stack (struct task_struct *task,unsigned long *esp) {struct KBacktraceIterator kbt;
arch/um/kernel/sysrq.c +1 -1
@@ -39,7 +39,7 @@ void show_trace(struct task_struct *task, unsigned long * stack)static const int kstack_depth_to_print =24 ;/* This recently started being used in arch-independent code too, as in -* kernel/sched.c.*/ +* kernel/sched/core.c.*/ void show_stack (struct task_struct *task,unsigned long *esp) {unsigned long *stack;
include/linux/completion.h +1 -1
@@ -5,7 +5,7 @@* (C) Copyright 2001 Linus Torvalds * * Atomic wait-for-completion handler data structures. -* See kernel/sched.c for details. +* See kernel/sched/core.c for details. */ #include <linux/wait.h>
include/linux/perf_event.h +1 -1
@@ -802,7 +802,7 @@ static inline void perf_restore_debug_store(void) { }#define perf_output_put (handle, x) perf_output_copy((handle), &(x), sizeof(x))/* -* This has to have a higher priority than migration_notifier in sched.c. +* This has to have a higher priority than migration_notifier in sched/core.c. */ #define perf_cpu_notifier (fn) \ do { \
include/linux/sched.h +2 -7
@@ -924,7 +924,7 @@ struct load_weight {struct sched_avg {/* * These sums represent an infinite geometric series and so are bound -* above by 1024/(1-y). Thus we only need a u32 to store them for for all +* above by 1024/(1-y). Thus we only need a u32 to store them for all * choices of y < 1-2^(-32)*1024. */ u32 runnable_avg_sum, runnable_avg_period;
@@ -994,12 +994,7 @@ struct sched_entity {struct cfs_rq *my_q;#endif -/* -* Load-tracking only depends on SMP, FAIR_GROUP_SCHED dependency below may be -* removed when useful for applications beyond shares distribution (e.g. -* load-balance). -*/ -#if defined(CONFIG_SMP ) && defined(CONFIG_FAIR_GROUP_SCHED ) +#ifdef CONFIG_SMP /* Per-entity load-tracking */ struct sched_avg avg;#endif
include/linux/spinlock_up.h +1 -1
@@ -67,7 +67,7 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)#else /* DEBUG_SPINLOCK */ #define arch_spin_is_locked (lock) ((void)(lock), 0) -/* for sched.c and kernel_lock.c: */ +/* for sched/core.c and kernel_lock.c: */ # define arch_spin_lock (lock) do { barrier(); (void)(lock); } while (0)# define arch_spin_lock_flags (lock, flags) do { barrier(); (void)(lock); } while (0)# define arch_spin_unlock (lock) do { barrier(); (void)(lock); } while (0)
include/uapi/asm-generic/unistd.h +1 -1
@@ -361,7 +361,7 @@ __SYSCALL(__NR_syslog, sys_syslog)#define __NR_ptrace 117__SYSCALL (__NR_ptrace, sys_ptrace) -/* kernel/sched.c */ +/* kernel/sched/core.c */#define __NR_sched_setparam 118 __SYSCALL(__NR_sched_setparam, sys_sched_setparam)#define __NR_sched_setscheduler 119
kernel/cpuset.c +2 -2
@@ -540,7 +540,7 @@ static void update_domain_attr_tree(struct sched_domain_attr *dattr,* This function builds a partial partition of the systems CPUs * A 'partial partition' is a set of non-overlapping subsets whose * union is a subset of that set. -* The output of this function needs to be passed to kernel/sched.c +* The output of this function needs to be passed to kernel/sched/core.c * partition_sched_domains() routine, which will rebuild the scheduler's * load balancing domains (sched domains) as specified by that partial * partition.
@@ -569,7 +569,7 @@ static void update_domain_attr_tree(struct sched_domain_attr *dattr,* is a subset of one of these domains, while there are as * many such domains as possible, each as small as possible. * doms - Conversion of 'csa' to an array of cpumasks, for passing to -* the kernel/sched.c routine partition_sched_domains() in a +* the kernel/sched/core.c routine partition_sched_domains() in a * convenient format, that can be easily compared to the prior * value to determine what partition elements (sched domains) * were changed (added or removed.)
kernel/sched/Makefile +1 -1
@@ -11,7 +11,7 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer endif -obj-y += core.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o +obj-y += core.o proc.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o obj-$(CONFIG_SMP) += cpupri.o obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o obj-$(CONFIG_SCHEDSTATS) += stats.o
kernel/sched/auto_group.c +1 -2
@@ -77,8 +77,6 @@ static inline struct autogroup *autogroup_create(void)if (IS_ERR (tg)) goto out_free; -sched_online_group (tg, &root_task_group); -kref_init (&ag->kref);init_rwsem (&ag->lock); ag->id =atomic_inc_return (&autogroup_seq_nr);
@@ -98,6 +96,7 @@ static inline struct autogroup *autogroup_create(void)#endif tg->autogroup = ag; +sched_online_group (tg, &root_task_group);return ag; out_free:
kernel/sched/core.c +33 -604
774 lines not on this page · raw message
kernel/sched/cputime.c +2 -3
@@ -515,9 +515,8 @@ static cputime_t scale_stime(u64 stime, u64 rtime, u64 total)for (;;) {/* Make sure "rtime" is the bigger of stime/rtime */ -if (stime > rtime) { -u64 tmp = rtime; rtime = stime; stime = tmp; - } +if (stime > rtime) +swap (rtime, stime);/* Make sure 'total' fits in 32 bits */ if (total >>32 )
kernel/sched/debug.c +23 -14
@@ -209,22 +209,24 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) cfs_rq->nr_spread_over);SEQ_printf (m," .%-30s: %d\n" ,"nr_running" , cfs_rq->nr_running);SEQ_printf (m," .%-30s: %ld\n" ,"load" , cfs_rq->load.weight); -#ifdef CONFIG_FAIR_GROUP_SCHED #ifdef CONFIG_SMP -SEQ_printf (m," .%-30s: %lld\n" ,"runnable_load_avg" , +SEQ_printf (m," .%-30s: %ld\n" ,"runnable_load_avg" , cfs_rq->runnable_load_avg); -SEQ_printf (m," .%-30s: %lld\n" ,"blocked_load_avg" , +SEQ_printf (m," .%-30s: %ld\n" ,"blocked_load_avg" , cfs_rq->blocked_load_avg); -SEQ_printf (m," .%-30s: %lld\n" ,"tg_load_avg" , - (unsigned long long )atomic64_read (&cfs_rq->tg->load_avg)); -SEQ_printf (m," .%-30s: %lld\n" ,"tg_load_contrib" , +#ifdef CONFIG_FAIR_GROUP_SCHED +SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_contrib" , cfs_rq->tg_load_contrib);SEQ_printf (m," .%-30s: %d\n" ,"tg_runnable_contrib" , cfs_rq->tg_runnable_contrib); +SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_avg" , +atomic_long_read (&cfs_rq->tg->load_avg));SEQ_printf (m," .%-30s: %d\n" ,"tg->runnable_avg" ,atomic_read (&cfs_rq->tg->runnable_avg));#endif +#endif +#ifdef CONFIG_FAIR_GROUP_SCHED print_cfs_group_stats (m, cpu, cfs_rq->tg);#endif }
@@ -493,15 +495,16 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)SEQ_printf (m,"%s (%d, #threads: %d)\n" , p->comm, p->pid,get_nr_threads (p));SEQ_printf (m, -"---------------------------------------------------------\n" ); +"---------------------------------------------------------" +"----------\n" );#define __P (F ) \ - SEQ_printf(m, "%-35s:%21Ld\n", #F, (long long)F) + SEQ_printf(m, "%-45s:%21Ld\n", #F, (long long)F)#define P (F ) \ - SEQ_printf(m, "%-35s:%21Ld\n", #F, (long long)p->F) + SEQ_printf(m, "%-45s:%21Ld\n", #F, (long long)p->F)#define __PN (F ) \ - SEQ_printf(m, "%-35s:%14Ld.%06ld\n", #F, SPLIT_NS((long long)F)) + SEQ_printf(m, "%-45s:%14Ld.%06ld\n", #F, SPLIT_NS((long long)F))#define PN (F ) \ - SEQ_printf(m, "%-35s:%14Ld.%06ld\n", #F, SPLIT_NS((long long)p->F)) + SEQ_printf(m, "%-45s:%14Ld.%06ld\n", #F, SPLIT_NS((long long)p->F))PN (se.exec_start);PN (se.vruntime);
@@ -560,12 +563,18 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) }#endif __P (nr_switches); -SEQ_printf (m,"%-35s:%21Ld\n" , +SEQ_printf (m,"%-45s:%21Ld\n" ,"nr_voluntary_switches" , (long long )p->nvcsw); -SEQ_printf (m,"%-35s:%21Ld\n" , +SEQ_printf (m,"%-45s:%21Ld\n" ,"nr_involuntary_switches" , (long long )p->nivcsw);P (se.load.weight); +#ifdef CONFIG_SMP +P (se.avg.runnable_avg_sum); +P (se.avg.runnable_avg_period); +P (se.avg.load_avg_contrib); +P (se.avg.decay_count); +#endif P (policy);P (prio);#undef PN
@@ -579,7 +588,7 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) t0 =cpu_clock (this_cpu); t1 =cpu_clock (this_cpu); -SEQ_printf (m,"%-35s:%21Ld\n" , +SEQ_printf (m,"%-45s:%21Ld\n" ,"clock-delta" , (long long )(t1-t0)); } }
kernel/sched/fair.c +106 -69
460 lines not on this page · raw message
kernel/sched/proc.c new file +591 -0
591 lines not on this page · raw message
kernel/sched/rt.c +21 -111
216 lines not on this page · raw message
kernel/sched/sched.h +29 -42
140 lines not on this page · raw message
kernel/sched/stats.h +4 -4
@@ -61,7 +61,7 @@ static inline void sched_info_reset_dequeued(struct task_struct *t)*/ static inline void sched_info_dequeued (struct task_struct *t) { -unsigned long long now =task_rq (t)->clock, delta =0 ; +unsigned long long now =rq_clock (task_rq (t)), delta =0 ;if (unlikely (sched_info_on ()))if (t->sched_info.last_queued)
@@ -79,7 +79,7 @@ static inline void sched_info_dequeued(struct task_struct *t)*/ static void sched_info_arrive (struct task_struct *t) { -unsigned long long now =task_rq (t)->clock, delta =0 ; +unsigned long long now =rq_clock (task_rq (t)), delta =0 ;if (t->sched_info.last_queued) delta = now - t->sched_info.last_queued;
@@ -100,7 +100,7 @@ static inline void sched_info_queued(struct task_struct *t) {if (unlikely (sched_info_on ()))if (!t->sched_info.last_queued) - t->sched_info.last_queued =task_rq (t)->clock; + t->sched_info.last_queued =rq_clock (task_rq (t)); }/*
@@ -112,7 +112,7 @@ static inline void sched_info_queued(struct task_struct *t)*/ static inline void sched_info_depart (struct task_struct *t) { -unsigned long long delta =task_rq (t)->clock - +unsigned long long delta =rq_clock (task_rq (t)) - t->sched_info.last_arrival;rq_sched_info_depart (task_rq (t), delta);
kernel/sched/stop_task.c +4 -4
@@ -28,7 +28,7 @@ static struct task_struct *pick_next_task_stop(struct rq *rq)struct task_struct *stop = rq->stop;if (stop && stop->on_rq) { - stop->se.exec_start = rq->clock_task; + stop->se.exec_start =rq_clock_task (rq);return stop; }
@@ -57,7 +57,7 @@ static void put_prev_task_stop(struct rq *rq, struct task_struct *prev)struct task_struct *curr = rq->curr;u64 delta_exec; - delta_exec = rq->clock_task - curr->se.exec_start; + delta_exec =rq_clock_task (rq) - curr->se.exec_start;if (unlikely ((s64 )delta_exec <0 )) delta_exec =0 ;
@@ -67,7 +67,7 @@ static void put_prev_task_stop(struct rq *rq, struct task_struct *prev) curr->se.sum_exec_runtime += delta_exec;account_group_exec_runtime (curr, delta_exec); - curr->se.exec_start = rq->clock_task; + curr->se.exec_start =rq_clock_task (rq);cpuacct_charge (curr, delta_exec); }
@@ -79,7 +79,7 @@ static void set_curr_task_stop(struct rq *rq) {struct task_struct *stop = rq->stop; - stop->se.exec_start = rq->clock_task; + stop->se.exec_start =rq_clock_task (rq); }static void switched_to_stop (struct rq *rq,struct task_struct *p)
kernel/time.c +1 -1
@@ -11,7 +11,7 @@* Modification history kernel/time.c * * 1993-09-02 Philip Gladstone -* Created file with time related functions from sched.c and adjtimex() +* Created file with time related functions from sched/core.c and adjtimex() * 1993-10-08 Torsten Duwe * adjtime interface update and CMOS clock write code * 1995-08-13 Torsten Duwe
kernel/workqueue_internal.h +1 -1
@@ -64,7 +64,7 @@ static inline struct worker *current_wq_worker(void)/* * Scheduler hooks for concurrency managed workqueue. Only to be used from -* sched.c and workqueue.c. +* sched/core.c and workqueue.c. */ void wq_worker_waking_up (struct task_struct *task,int cpu);struct task_struct *wq_worker_sleeping (struct task_struct *task,int cpu);