[PATCH 4/5] 2.6.0 sched style fixes

Nick Piggin
2003-12-20T15:24:36Z

[-- Attachment #1: Type: text/plain, Size: 49 bytes --]

Couple of small spacing and indentation changes

[-- Attachment #2: sched-style.patch --]
[-- Type: text/plain, Size: 2996 bytes --]

Couple of small spacing and indentation changes

linux-2.6-npiggin/kernel/sched.c | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)

diff -puN kernel/sched.c~sched-style kernel/sched.c
--- linux-2.6/kernel/sched.c~sched-style 2003-12-04 13:01:07.000000000 +1100
+++ linux-2.6-npiggin/kernel/sched.c 2003-12-04 13:01:25.000000000 +1100
@@ -396,7 +396,7 @@ static void recalc_task_prio(task_t *p,
* other processes.
*/
if (p->mm && p->activated != -1 &&
- sleep_time > JUST_INTERACTIVE_SLEEP(p)){
+ sleep_time > JUST_INTERACTIVE_SLEEP(p)) {
p->sleep_avg = JIFFIES_TO_NS(MAX_SLEEP_AVG -
AVG_TIMESLICE);
if (!HIGH_CREDIT(p))
@@ -422,15 +422,15 @@ static void recalc_task_prio(task_t *p,
* sleep are limited in their sleep_avg rise as they
* are likely to be cpu hogs waiting on I/O
*/
- if (p->activated == -1 && !HIGH_CREDIT(p) && p->mm){
+ if (p->activated == -1 && !HIGH_CREDIT(p) && p->mm) {
if (p->sleep_avg >= JUST_INTERACTIVE_SLEEP(p))
sleep_time = 0;
else if (p->sleep_avg + sleep_time >=
- JUST_INTERACTIVE_SLEEP(p)){
- p->sleep_avg =
- JUST_INTERACTIVE_SLEEP(p);
- sleep_time = 0;
- }
+ JUST_INTERACTIVE_SLEEP(p)) {
+ p->sleep_avg =
+ JUST_INTERACTIVE_SLEEP(p);
+ sleep_time = 0;
+ }
}

/*
@@ -443,7 +443,7 @@ static void recalc_task_prio(task_t *p,
*/
p->sleep_avg += sleep_time;

- if (p->sleep_avg > NS_MAX_SLEEP_AVG){
+ if (p->sleep_avg > NS_MAX_SLEEP_AVG) {
p->sleep_avg = NS_MAX_SLEEP_AVG;
if (!HIGH_CREDIT(p))
p->interactive_credit++;
@@ -470,7 +470,7 @@ static inline void activate_task(task_t
* This checks to make sure it's not an uninterruptible task
* that is now waking up.
*/
- if (!p->activated){
+ if (!p->activated) {
/*
* Tasks which were woken up by interrupts (ie. hw events)
* are most likely of interactive nature. So we give them
@@ -480,13 +480,14 @@ static inline void activate_task(task_t
*/
if (in_interrupt())
p->activated = 2;
- else
- /*
- * Normal first-time wakeups get a credit too for on-runqueue
- * time, but it will be weighted down:
- */
+ else {
+ /*
+ * Normal first-time wakeups get a credit too for on-runqueue
+ * time, but it will be weighted down:
+ */
p->activated = 1;
}
+ }
p->timestamp = now;

__activate_task(p, rq);
@@ -638,7 +639,7 @@ repeat_lock_task:
task_rq_unlock(rq, &flags);
goto repeat_lock_task;
}
- if (old_state == TASK_UNINTERRUPTIBLE){
+ if (old_state == TASK_UNINTERRUPTIBLE) {
rq->nr_uninterruptible--;
/*
* Tasks on involuntary sleep don't earn
@@ -1603,7 +1604,7 @@ switch_tasks:
RCU_qsctr(task_cpu(prev))++;

prev->sleep_avg -= run_time;
- if ((long)prev->sleep_avg <= 0){
+ if ((long)prev->sleep_avg <= 0) {
prev->sleep_avg = 0;
if (!(HIGH_CREDIT(prev) || LOW_CREDIT(prev)))
prev->interactive_credit--;

_