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

Commit 612ef28a authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip 

Conflicts:
	drivers/cpufreq/cpufreq_conservative.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/macintosh/rack-meter.c
	fs/proc/stat.c
	fs/proc/uptime.c
	kernel/sched/core.c
parents c3e0ef9a 07cde260

arch/s390/appldata/appldata_os.c

+8 −8
Original line number Diff line number Diff line
@@ -115,21 +115,21 @@ static void appldata_get_os_data(void *data) 
	j = 0;

	for_each_online_cpu(i) {

		os_data->os_cpu[j].per_cpu_user =

			cputime_to_jiffies(kstat_cpu(i).cpustat.user);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);

		os_data->os_cpu[j].per_cpu_nice =

			cputime_to_jiffies(kstat_cpu(i).cpustat.nice);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);

		os_data->os_cpu[j].per_cpu_system =

			cputime_to_jiffies(kstat_cpu(i).cpustat.system);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);

		os_data->os_cpu[j].per_cpu_idle =

			cputime_to_jiffies(kstat_cpu(i).cpustat.idle);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);

		os_data->os_cpu[j].per_cpu_irq =

			cputime_to_jiffies(kstat_cpu(i).cpustat.irq);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);

		os_data->os_cpu[j].per_cpu_softirq =

			cputime_to_jiffies(kstat_cpu(i).cpustat.softirq);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);

		os_data->os_cpu[j].per_cpu_iowait =

			cputime_to_jiffies(kstat_cpu(i).cpustat.iowait);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);

		os_data->os_cpu[j].per_cpu_steal =

			cputime_to_jiffies(kstat_cpu(i).cpustat.steal);

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);

		os_data->os_cpu[j].cpu_id = i;

		j++;

	}

arch/x86/include/asm/i387.h

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static inline void fpu_fxsave(struct fpu *fpu) 
#ifdef CONFIG_SMP

#define safe_address (__per_cpu_offset[0])

#else

#define safe_address (kstat_cpu(0).cpustat.user)

#define safe_address (__get_cpu_var(kernel_cpustat).cpustat[CPUTIME_USER])

#endif



/*

drivers/cpufreq/cpufreq_conservative.c

+20 −21
Original line number Diff line number Diff line
@@ -95,26 +95,26 @@ static struct dbs_tuners { 
	.freq_step = 5,

};



static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,

							cputime64_t *wall)

static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)

{

	cputime64_t idle_time;

	cputime64_t cur_wall_time;

	cputime64_t busy_time;

	u64 idle_time;

	u64 cur_wall_time;

	u64 busy_time;



	cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());

	busy_time  = kstat_cpu(cpu).cpustat.user;

	busy_time += kstat_cpu(cpu).cpustat.system;

	busy_time += kstat_cpu(cpu).cpustat.irq;

	busy_time += kstat_cpu(cpu).cpustat.softirq;

	busy_time += kstat_cpu(cpu).cpustat.steal;

	busy_time += kstat_cpu(cpu).cpustat.nice;



	busy_time  = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];



	idle_time = cur_wall_time - busy_time;

	if (wall)

		*wall = (cputime64_t)jiffies_to_usecs(cur_wall_time);

		*wall = jiffies_to_usecs(cur_wall_time);



	return (cputime64_t)jiffies_to_usecs(idle_time);

	return jiffies_to_usecs(idle_time);

}



static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)
@@ -271,7 +271,7 @@ static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b, 
		dbs_info->prev_cpu_idle = get_cpu_idle_time(j,

						&dbs_info->prev_cpu_wall);

		if (dbs_tuners_ins.ignore_nice)

			dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice;

			dbs_info->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];

	}

	return count;

}
@@ -361,10 +361,10 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) 
		j_dbs_info->prev_cpu_idle = cur_idle_time;



		if (dbs_tuners_ins.ignore_nice) {

			cputime64_t cur_nice;

			u64 cur_nice;

			unsigned long cur_nice_jiffies;



			cur_nice = kstat_cpu(j).cpustat.nice -

			cur_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE] -

					 j_dbs_info->prev_cpu_nice;

			/*

			 * Assumption: nice time between sampling periods will
@@ -373,7 +373,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) 
			cur_nice_jiffies = (unsigned long)

					cputime64_to_jiffies64(cur_nice);



			j_dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice;

			j_dbs_info->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];

			idle_time += jiffies_to_usecs(cur_nice_jiffies);

		}
@@ -500,10 +500,9 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, 


			j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j,

						&j_dbs_info->prev_cpu_wall);

			if (dbs_tuners_ins.ignore_nice) {

			if (dbs_tuners_ins.ignore_nice)

				j_dbs_info->prev_cpu_nice =

						kstat_cpu(j).cpustat.nice;

			}

						kcpustat_cpu(j).cpustat[CPUTIME_NICE];

		}

		this_dbs_info->down_skip = 0;

		this_dbs_info->requested_freq = policy->cur;

drivers/cpufreq/cpufreq_ondemand.c

+20 −21
Original line number Diff line number Diff line
@@ -119,26 +119,26 @@ static struct dbs_tuners { 
	.powersave_bias = 0,

};



static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,

							cputime64_t *wall)

static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)

{

	cputime64_t idle_time;

	cputime64_t cur_wall_time;

	cputime64_t busy_time;

	u64 idle_time;

	u64 cur_wall_time;

	u64 busy_time;



	cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());

	busy_time  = kstat_cpu(cpu).cpustat.user;

	busy_time += kstat_cpu(cpu).cpustat.system;

	busy_time += kstat_cpu(cpu).cpustat.irq;

	busy_time += kstat_cpu(cpu).cpustat.softirq;

	busy_time += kstat_cpu(cpu).cpustat.steal;

	busy_time += kstat_cpu(cpu).cpustat.nice;



	busy_time  = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];



	idle_time = cur_wall_time - busy_time;

	if (wall)

		*wall = (cputime64_t)jiffies_to_usecs(cur_wall_time);

		*wall = jiffies_to_usecs(cur_wall_time);



	return (cputime64_t)jiffies_to_usecs(idle_time);

	return jiffies_to_usecs(idle_time);

}



static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)
@@ -344,7 +344,7 @@ static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b, 
		dbs_info->prev_cpu_idle = get_cpu_idle_time(j,

						&dbs_info->prev_cpu_wall);

		if (dbs_tuners_ins.ignore_nice)

			dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice;

			dbs_info->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];



	}

	return count;
@@ -454,10 +454,10 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) 
		j_dbs_info->prev_cpu_iowait = cur_iowait_time;



		if (dbs_tuners_ins.ignore_nice) {

			cputime64_t cur_nice;

			u64 cur_nice;

			unsigned long cur_nice_jiffies;



			cur_nice = kstat_cpu(j).cpustat.nice -

			cur_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE] -

					 j_dbs_info->prev_cpu_nice;

			/*

			 * Assumption: nice time between sampling periods will
@@ -466,7 +466,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) 
			cur_nice_jiffies = (unsigned long)

					cputime64_to_jiffies64(cur_nice);



			j_dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice;

			j_dbs_info->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];

			idle_time += jiffies_to_usecs(cur_nice_jiffies);

		}
@@ -645,10 +645,9 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, 


			j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j,

						&j_dbs_info->prev_cpu_wall);

			if (dbs_tuners_ins.ignore_nice) {

			if (dbs_tuners_ins.ignore_nice)

				j_dbs_info->prev_cpu_nice =

						kstat_cpu(j).cpustat.nice;

			}

						kcpustat_cpu(j).cpustat[CPUTIME_NICE];

		}

		this_dbs_info->cpu = cpu;

		this_dbs_info->rate_mult = 1;

drivers/macintosh/rack-meter.c

+4 −3
Original line number Diff line number Diff line
@@ -81,12 +81,13 @@ static int rackmeter_ignore_nice; 
 */

static inline cputime64_t get_cpu_idle_time(unsigned int cpu)

{

	cputime64_t retval;

	u64 retval;



	retval = kstat_cpu(cpu).cpustat.idle + kstat_cpu(cpu).cpustat.iowait;

	retval = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE] +

		 kcpustat_cpu(cpu).cpustat[CPUTIME_IOWAIT];



	if (rackmeter_ignore_nice)

		retval += kstat_cpu(cpu).cpustat.nice;

		retval += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];



	return retval;

}