Skip to content

Commit 0a0fca9

Browse files
vireshkingomolnar
authored andcommitted
sched: Rename sched.c as sched/core.c in comments and Documentation
Most of the stuff from kernel/sched.c was moved to kernel/sched/core.c long time back and the comments/Documentation never got updated. I figured it out when I was going through sched-domains.txt and so thought of fixing it globally. I haven't crossed check if the stuff that is referenced in sched/core.c by all these files is still present and hasn't changed as that wasn't the motive behind this patch. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/cdff76a265326ab8d71922a1db5be599f20aad45.1370329560.git.viresh.kumar@linaro.org Signed-off-by: Ingo Molnar <[email protected]>
1 parent 8404c90 commit 0a0fca9

File tree

21 files changed

+27
-26
lines changed

21 files changed

+27
-26
lines changed

Documentation/cgroups/cpusets.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ can become very uneven.
373373
1.7 What is sched_load_balance ?
374374
--------------------------------
375375

376-
The kernel scheduler (kernel/sched.c) automatically load balances
376+
The kernel scheduler (kernel/sched/core.c) automatically load balances
377377
tasks. If one CPU is underutilized, kernel code running on that
378378
CPU will look for tasks on other more overloaded CPUs and move those
379379
tasks to itself, within the constraints of such placement mechanisms

Documentation/rt-mutex-design.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ priority back.
384384
__rt_mutex_adjust_prio examines the result of rt_mutex_getprio, and if the
385385
result does not equal the task's current priority, then rt_mutex_setprio
386386
is called to adjust the priority of the task to the new priority.
387-
Note that rt_mutex_setprio is defined in kernel/sched.c to implement the
387+
Note that rt_mutex_setprio is defined in kernel/sched/core.c to implement the
388388
actual change in priority.
389389

390390
It is interesting to note that __rt_mutex_adjust_prio can either increase

Documentation/scheduler/sched-domains.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ is treated as one entity. The load of a group is defined as the sum of the
2525
load of each of its member CPUs, and only when the load of a group becomes
2626
out of balance are tasks moved between groups.
2727

28-
In kernel/sched.c, trigger_load_balance() is run periodically on each CPU
28+
In kernel/sched/core.c, trigger_load_balance() is run periodically on each CPU
2929
through scheduler_tick(). It raises a softirq after the next regularly scheduled
3030
rebalancing event for the current runqueue has arrived. The actual load
3131
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
6262
the specifics and what to tune.
6363

6464
Architectures may retain the regular override the default SD_*_INIT flags
65-
while using the generic domain builder in kernel/sched.c if they wish to
65+
while using the generic domain builder in kernel/sched/core.c if they wish to
6666
retain the traditional SMT->SMP->NUMA topology (or some subset of that). This
6767
can be done by #define'ing ARCH_HASH_SCHED_TUNE.
6868

Documentation/spinlocks.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ don't block on each other (and thus there is no dead-lock wrt interrupts.
137137
But when you do the write-lock, you have to use the irq-safe version.
138138

139139
For an example of being clever with rw-locks, see the "waitqueue_lock"
140-
handling in kernel/sched.c - nothing ever _changes_ a wait-queue from
140+
handling in kernel/sched/core.c - nothing ever _changes_ a wait-queue from
141141
within an interrupt, they only read the queue in order to know whom to
142142
wake up. So read-locks are safe (which is good: they are very common
143143
indeed), while write-locks need to protect themselves against interrupts.

Documentation/virtual/uml/UserModeLinux-HOWTO.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3127,7 +3127,7 @@
31273127
at process_kern.c:156
31283128
#3 0x1006a052 in switch_to (prev=0x50072000, next=0x507e8000, last=0x50072000)
31293129
at process_kern.c:161
3130-
#4 0x10001d12 in schedule () at sched.c:777
3130+
#4 0x10001d12 in schedule () at core.c:777
31313131
#5 0x1006a744 in __down (sem=0x507d241c) at semaphore.c:71
31323132
#6 0x1006aa10 in __down_failed () at semaphore.c:157
31333133
#7 0x1006c5d8 in segv_handler (sc=0x5006e940) at trap_user.c:174
@@ -3191,7 +3191,7 @@
31913191
at process_kern.c:161
31923192
161 _switch_to(prev, next);
31933193
(gdb)
3194-
#4 0x10001d12 in schedule () at sched.c:777
3194+
#4 0x10001d12 in schedule () at core.c:777
31953195
777 switch_to(prev, next, prev);
31963196
(gdb)
31973197
#5 0x1006a744 in __down (sem=0x507d241c) at semaphore.c:71

arch/avr32/kernel/process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ unsigned long get_wchan(struct task_struct *p)
341341
* is actually quite ugly. It might be possible to
342342
* determine the frame size automatically at build
343343
* time by doing this:
344-
* - compile sched.c
344+
* - compile sched/core.c
345345
* - disassemble the resulting sched.o
346346
* - look for 'sub sp,??' shortly after '<schedule>:'
347347
*/

arch/cris/include/arch-v10/arch/bitops.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static inline unsigned long cris_swapnwbrlz(unsigned long w)
1717
in another register:
1818
! __asm__ ("swapnwbr %2\n\tlz %2,%0"
1919
! : "=r,r" (res), "=r,X" (dummy) : "1,0" (w));
20-
confuses gcc (sched.c, gcc from cris-dist-1.14). */
20+
confuses gcc (core.c, gcc from cris-dist-1.14). */
2121

2222
unsigned long res;
2323
__asm__ ("swapnwbr %0 \n\t"

arch/ia64/kernel/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ END(ia64_delay_loop)
10351035
* Return a CPU-local timestamp in nano-seconds. This timestamp is
10361036
* NOT synchronized across CPUs its return value must never be
10371037
* compared against the values returned on another CPU. The usage in
1038-
* kernel/sched.c ensures that.
1038+
* kernel/sched/core.c ensures that.
10391039
*
10401040
* The return-value of sched_clock() is NOT supposed to wrap-around.
10411041
* If it did, it would cause some scheduling hiccups (at the worst).

arch/mips/kernel/mips-mt-fpaff.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ unsigned long mt_fpemul_threshold;
2727
* FPU affinity with the user's requested processor affinity.
2828
* This code is 98% identical with the sys_sched_setaffinity()
2929
* and sys_sched_getaffinity() system calls, and should be
30-
* updated when kernel/sched.c changes.
30+
* updated when kernel/sched/core.c changes.
3131
*/
3232

3333
/*
3434
* find_process_by_pid - find a process with a matching PID value.
35-
* used in sys_sched_set/getaffinity() in kernel/sched.c, so
35+
* used in sys_sched_set/getaffinity() in kernel/sched/core.c, so
3636
* cloned here.
3737
*/
3838
static inline struct task_struct *find_process_by_pid(pid_t pid)

arch/mips/kernel/scall32-o32.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,9 @@ einval: li v0, -ENOSYS
476476
/*
477477
* For FPU affinity scheduling on MIPS MT processors, we need to
478478
* intercept sys_sched_xxxaffinity() calls until we get a proper hook
479-
* in kernel/sched.c. Considered only temporary we only support these
480-
* hooks for the 32-bit kernel - there is no MIPS64 MT processor atm.
479+
* in kernel/sched/core.c. Considered only temporary we only support
480+
* these hooks for the 32-bit kernel - there is no MIPS64 MT processor
481+
* atm.
481482
*/
482483
sys mipsmt_sys_sched_setaffinity 3
483484
sys mipsmt_sys_sched_getaffinity 3

0 commit comments

Comments
 (0)