leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] small kernel/sched.c cleanup

Browse Source 
- constify and optimize stat_nam (thanks to Michael Tokarev!)
- spelling and comment fixes

Signed-off-by: Andreas Mohr <andi@lisas.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andreas Mohr 2006-07-10 04:43:52 -07:00 committed by Linus Torvalds
parent 0a565f7919
commit 2ed6e34f88
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/sched.c
View File

@ -3384,7 +3384,7 @@ EXPORT_SYMBOL(schedule);
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
/* /*
* this is is the entry point to schedule() from in-kernel preemption * this is the entry point to schedule() from in-kernel preemption
* off of preempt_enable. Kernel preemptions off return from interrupt * off of preempt_enable. Kernel preemptions off return from interrupt
* occur there and call schedule directly. * occur there and call schedule directly.
*/ */
@ -3427,7 +3427,7 @@ need_resched:
EXPORT_SYMBOL(preempt_schedule); EXPORT_SYMBOL(preempt_schedule);
/* /*
* this is is the entry point to schedule() from kernel preemption * this is the entry point to schedule() from kernel preemption
* off of irq context. * off of irq context.
* Note, that this is called and return with irqs disabled. This will * Note, that this is called and return with irqs disabled. This will
* protect us against recursive calling from irq. * protect us against recursive calling from irq.
@ -4650,7 +4650,7 @@ static inline struct task_struct *younger_sibling(struct task_struct *p)
return list_entry(p->sibling.next,struct task_struct,sibling); return list_entry(p->sibling.next,struct task_struct,sibling);
} }
static const char *stat_nam[] = { "R", "S", "D", "T", "t", "Z", "X" }; static const char stat_nam[] = "RSDTtZX";
static void show_task(struct task_struct *p) static void show_task(struct task_struct *p)
{ {
@ -4658,12 +4658,9 @@ static void show_task(struct task_struct *p)
unsigned long free = 0; unsigned long free = 0;
unsigned state; unsigned state;
printk("%-13.13s ", p->comm);
state = p->state ? __ffs(p->state) + 1 : 0; state = p->state ? __ffs(p->state) + 1 : 0;
if (state < ARRAY_SIZE(stat_nam)) printk("%-13.13s %c", p->comm,
printk(stat_nam[state]); state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
else
printk("?");
#if (BITS_PER_LONG == 32) #if (BITS_PER_LONG == 32)
if (state == TASK_RUNNING) if (state == TASK_RUNNING)
printk(" running "); printk(" running ");
@ -5776,7 +5773,7 @@ static unsigned long long measure_migration_cost(int cpu1, int cpu2)
cache = vmalloc(max_size); cache = vmalloc(max_size);
if (!cache) { if (!cache) {
printk("could not vmalloc %d bytes for cache!\n", 2*max_size); printk("could not vmalloc %d bytes for cache!\n", 2*max_size);
return 1000000; // return 1 msec on very small boxen return 1000000; /* return 1 msec on very small boxen */
} }
while (size <= max_size) { while (size <= max_size) {