Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Kernel v2.4.6 /kernel/sched.c

Filename:/kernel/sched.c
Lines Added:10
Lines Deleted:10
Also changed in: (Previous) 2.4.6-pre9  2.4.6-pre8  2.4.6-pre7  2.4.6-pre6  2.4.6-pre5  2.4.6-pre4 
(Following) 2.4.6-ac1  2.4.6-ac2  2.4.6-ac3  2.4.6-ac4  2.4.6-ac5  2.4.7-pre5 

Location
[  2.4.6
  [  kernel
     o  sched.c

Patch

diff -u --recursive --new-file v2.4.5/linux/kernel/sched.c linux/kernel/sched.c
--- v2.4.5/linux/kernel/sched.c   Fri Apr 20 18:26:16 2001
+++ linux/kernel/sched.c   Wed Jun 27 14:12:04 2001
@@ -544,7 +544,7 @@
    release_kernel_lock(prev, this_cpu);
 
    /* Do "administrative" work here while we don't hold any locks */
-   if (softirq_active(this_cpu) & softirq_mask(this_cpu))
+   if (softirq_pending(this_cpu))
       goto handle_softirq;
 handle_softirq_back:
 
@@ -1104,7 +1104,7 @@
    int state;
    static const char * stat_nam[] = { "R", "S", "D", "Z", "T", "W" };
 
-   printk("%-8s  ", p->comm);
+   printk("%-13.13s ", p->comm);
    state = p->state ? ffz(~p->state) + 1 : 0;
    if (((unsigned) state) < sizeof(stat_nam)/sizeof(char *))
       printk(stat_nam[state]);
@@ -1132,21 +1132,21 @@
       printk("%5d ", p->p_cptr->pid);
    else
       printk("      ");
-   if (!p->mm)
-      printk(" (L-TLB) ");
-   else
-      printk(" (NOTLB) ");
    if (p->p_ysptr)
       printk("%7d", p->p_ysptr->pid);
    else
       printk("       ");
    if (p->p_osptr)
-      printk(" %5d\n", p->p_osptr->pid);
+      printk(" %5d", p->p_osptr->pid);
+   else
+      printk("      ");
+   if (!p->mm)
+      printk(" (L-TLB)\n");
    else
-      printk("\n");
+      printk(" (NOTLB)\n");
 
-#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)
-/* This is very useful, but only works on x86 and sparc64 right now */
+#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_ARM)
+/* This is very useful, but only works on ARM, x86 and sparc64 right now */
    {
       extern void show_trace_task(struct task_struct *tsk);
       show_trace_task(p);


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.