Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10b275dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: fix up fs/proc/array.c whitespace problems
  [PATCH] sched: prettify prio_to_wmult[]
  [PATCH] sched: document prio_to_wmult[]
  [PATCH] sched: improve weight-array comments
  [PATCH] sched: remove dead code from task_stime()

Fixed up trivial conflict in fs/proc/array.c
parents add09690 8ea02606

fs/proc/array.c

+26 −27
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 
#include <linux/mman.h>

#include <linux/proc_fs.h>

#include <linux/ioport.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/mm.h>

#include <linux/hugetlb.h>

#include <linux/pagemap.h>
@@ -76,9 +78,7 @@ 
#include <linux/rcupdate.h>

#include <linux/delayacct.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/io.h>

#include <asm/processor.h>

#include "internal.h"
@@ -342,7 +342,7 @@ static clock_t task_utime(struct task_struct *p) 


static clock_t task_stime(struct task_struct *p)

{

	clock_t stime = cputime_to_clock_t(p->stime);

	clock_t stime;



	/*

	 * Use CFS's precise accounting. (we subtract utime from
@@ -354,7 +354,6 @@ static clock_t task_stime(struct task_struct *p) 
	return stime;

}





static int do_task_stat(struct task_struct *task, char *buffer, int whole)

{

	unsigned long vsize, eip, esp, wchan = ~0UL;

kernel/sched.c

+18 −9
Original line number Diff line number Diff line
@@ -736,7 +736,9 @@ static void update_curr_load(struct rq *rq, u64 now) 
 *

 * The "10% effect" is relative and cumulative: from _any_ nice level,

 * if you go up 1 level, it's -10% CPU usage, if you go down 1 level

 * it's +10% CPU usage.

 * it's +10% CPU usage. (to achieve that we use a multiplier of 1.25.

 * If a task goes up by ~10% and another task goes down by ~10% then

 * the relative distance between them is ~25%.)

 */

static const int prio_to_weight[40] = {

/* -20 */ 88818, 71054, 56843, 45475, 36380, 29104, 23283, 18626, 14901, 11921,
@@ -746,15 +748,22 @@ static const int prio_to_weight[40] = { 
/*  10 */   110,    87,    70,    56,    45,    36,    29,    23,    18,    15,

};



/*

 * Inverse (2^32/x) values of the prio_to_weight[] array, precalculated.

 *

 * In cases where the weight does not change often, we can use the

 * precalculated inverse to speed up arithmetics by turning divisions

 * into multiplications:

 */

static const u32 prio_to_wmult[40] = {

	48356,   60446,   75558,   94446,  118058,  147573,

	184467,  230589,  288233,  360285,  450347,

	562979,  703746,  879575, 1099582, 1374389,

	1717986, 2147483, 2684354, 3355443, 4194304,

	5244160, 6557201, 8196502, 10250518, 12782640,

	16025997, 19976592, 24970740, 31350126, 39045157,

	49367440, 61356675, 76695844, 95443717, 119304647,

	148102320, 186737708, 238609294, 286331153,

/* -20 */     48356,     60446,     75558,     94446,    118058,

/* -15 */    147573,    184467,    230589,    288233,    360285,

/* -10 */    450347,    562979,    703746,    879575,   1099582,

/*  -5 */   1374389,   1717986,   2147483,   2684354,   3355443,

/*   0 */   4194304,   5244160,   6557201,   8196502,  10250518,

/*   5 */  12782640,  16025997,  19976592,  24970740,  31350126,

/*  10 */  39045157,  49367440,  61356675,  76695844,  95443717,

/*  15 */ 119304647, 148102320, 186737708, 238609294, 286331153,

};



static inline void