tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
[PATCH] sched: small topology.h cleanup
[PATCH] sched: fix show_task()/show_tasks() output
[PATCH] sched: remove stale version info from kernel/sched_debug.c
[PATCH] sched: allow larger granularity
[PATCH] sched: fix prio_to_wmult[] for nice 1

[ I re-did the commits to get rid of some bogus merge commit that
Ingo had. - Linus ]

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Linus Torvalds aba2da66 77320894

+14 -20
unified split
+1 -1
include/linux/topology.h
··· 50 for_each_online_node(node) \ 51 if (nr_cpus_node(node)) 52 53 - #ifndef node_distance 54 /* Conform to ACPI 2.0 SLIT distance definitions */ 55 #define LOCAL_DISTANCE 10 56 #define REMOTE_DISTANCE 20 57 #define node_distance(from,to) ((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE) 58 #endif 59 #ifndef RECLAIM_DISTANCE
··· 50 for_each_online_node(node) \ 51 if (nr_cpus_node(node)) 52 53 /* Conform to ACPI 2.0 SLIT distance definitions */ 54 #define LOCAL_DISTANCE 10 55 #define REMOTE_DISTANCE 20 56 + #ifndef node_distance 57 #define node_distance(from,to) ((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE) 58 #endif 59 #ifndef RECLAIM_DISTANCE
+12 -18
kernel/sched.c
··· 751 184467, 230589, 288233, 360285, 450347, 752 562979, 703746, 879575, 1099582, 1374389, 753 717986, 2147483, 2684354, 3355443, 4194304, 754 - 244160, 6557201, 8196502, 10250518, 12782640, 755 16025997, 19976592, 24970740, 31350126, 39045157, 756 49367440, 61356675, 76695844, 95443717, 119304647, 757 148102320, 186737708, 238609294, 286331153, ··· 4647 state = p->state ? __ffs(p->state) + 1 : 0; 4648 printk("%-13.13s %c", p->comm, 4649 state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?'); 4650 - #if (BITS_PER_LONG == 32) 4651 if (state == TASK_RUNNING) 4652 - printk(" running "); 4653 else 4654 - printk(" %08lX ", thread_saved_pc(p)); 4655 #else 4656 if (state == TASK_RUNNING) 4657 - printk(" running task "); 4658 else 4659 printk(" %016lx ", thread_saved_pc(p)); 4660 #endif ··· 4666 free = (unsigned long)n - (unsigned long)end_of_stack(p); 4667 } 4668 #endif 4669 - printk("%5lu %5d %6d", free, p->pid, p->parent->pid); 4670 - if (!p->mm) 4671 - printk(" (L-TLB)\n"); 4672 - else 4673 - printk(" (NOTLB)\n"); 4674 4675 if (state != TASK_RUNNING) 4676 show_stack(p, NULL); ··· 4676 { 4677 struct task_struct *g, *p; 4678 4679 - #if (BITS_PER_LONG == 32) 4680 - printk("\n" 4681 - " free sibling\n"); 4682 - printk(" task PC stack pid father child younger older\n"); 4683 #else 4684 - printk("\n" 4685 - " free sibling\n"); 4686 - printk(" task PC stack pid father child younger older\n"); 4687 #endif 4688 read_lock(&tasklist_lock); 4689 do_each_thread(g, p) { ··· 4772 static inline void sched_init_granularity(void) 4773 { 4774 unsigned int factor = 1 + ilog2(num_online_cpus()); 4775 - const unsigned long gran_limit = 10000000; 4776 4777 sysctl_sched_granularity *= factor; 4778 if (sysctl_sched_granularity > gran_limit)
··· 751 184467, 230589, 288233, 360285, 450347, 752 562979, 703746, 879575, 1099582, 1374389, 753 717986, 2147483, 2684354, 3355443, 4194304, 754 + 5244160, 6557201, 8196502, 10250518, 12782640, 755 16025997, 19976592, 24970740, 31350126, 39045157, 756 49367440, 61356675, 76695844, 95443717, 119304647, 757 148102320, 186737708, 238609294, 286331153, ··· 4647 state = p->state ? __ffs(p->state) + 1 : 0; 4648 printk("%-13.13s %c", p->comm, 4649 state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?'); 4650 + #if BITS_PER_LONG == 32 4651 if (state == TASK_RUNNING) 4652 + printk(" running "); 4653 else 4654 + printk(" %08lx ", thread_saved_pc(p)); 4655 #else 4656 if (state == TASK_RUNNING) 4657 + printk(" running task "); 4658 else 4659 printk(" %016lx ", thread_saved_pc(p)); 4660 #endif ··· 4666 free = (unsigned long)n - (unsigned long)end_of_stack(p); 4667 } 4668 #endif 4669 + printk("%5lu %5d %6d\n", free, p->pid, p->parent->pid); 4670 4671 if (state != TASK_RUNNING) 4672 show_stack(p, NULL); ··· 4680 { 4681 struct task_struct *g, *p; 4682 4683 + #if BITS_PER_LONG == 32 4684 + printk(KERN_INFO 4685 + " task PC stack pid father\n"); 4686 #else 4687 + printk(KERN_INFO 4688 + " task PC stack pid father\n"); 4689 #endif 4690 read_lock(&tasklist_lock); 4691 do_each_thread(g, p) { ··· 4778 static inline void sched_init_granularity(void) 4779 { 4780 unsigned int factor = 1 + ilog2(num_online_cpus()); 4781 + const unsigned long gran_limit = 100000000; 4782 4783 sysctl_sched_granularity *= factor; 4784 if (sysctl_sched_granularity > gran_limit)
+1 -1
kernel/sched_debug.c
··· 171 u64 now = ktime_to_ns(ktime_get()); 172 int cpu; 173 174 - SEQ_printf(m, "Sched Debug Version: v0.04, cfs-v20, %s %.*s\n", 175 init_utsname()->release, 176 (int)strcspn(init_utsname()->version, " "), 177 init_utsname()->version);
··· 171 u64 now = ktime_to_ns(ktime_get()); 172 int cpu; 173 174 + SEQ_printf(m, "Sched Debug Version: v0.05, %s %.*s\n", 175 init_utsname()->release, 176 (int)strcspn(init_utsname()->version, " "), 177 init_utsname()->version);