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

Commit c45140a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Properly truncate pt_regs framepointer in perf callback.
  arch/sparc/kernel: Use set_cpus_allowed_ptr
  sparc: Fix use of uid16_t and gid16_t in asm/stat.h
parents de329820 9e8307ec

arch/sparc/include/asm/stat.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -53,8 +53,8 @@ struct stat { 
	ino_t		st_ino;

	ino_t		st_ino;

	mode_t		st_mode;

	mode_t		st_mode;

	short		st_nlink;

	short		st_nlink;

	uid16_t		st_uid;

	unsigned short	st_uid;

	gid16_t		st_gid;

	unsigned short	st_gid;

	unsigned short	st_rdev;

	unsigned short	st_rdev;

	off_t		st_size;

	off_t		st_size;

	time_t		st_atime;

	time_t		st_atime;

arch/sparc/kernel/perf_event.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1337,7 +1337,7 @@ static void perf_callchain_user_32(struct pt_regs *regs, 
	callchain_store(entry, PERF_CONTEXT_USER);

	callchain_store(entry, PERF_CONTEXT_USER);

	callchain_store(entry, regs->tpc);

	callchain_store(entry, regs->tpc);





	ufp = regs->u_regs[UREG_I6];

	ufp = regs->u_regs[UREG_I6] & 0xffffffffUL;

	do {

	do {

		struct sparc_stackf32 *usf, sf;

		struct sparc_stackf32 *usf, sf;

		unsigned long pc;

		unsigned long pc;

arch/sparc/kernel/sysfs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -107,12 +107,12 @@ static unsigned long run_on_cpu(unsigned long cpu, 
	unsigned long ret;

	unsigned long ret;





	/* should return -EINVAL to userspace */

	/* should return -EINVAL to userspace */

	if (set_cpus_allowed(current, cpumask_of_cpu(cpu)))

	if (set_cpus_allowed_ptr(current, cpumask_of(cpu)))

		return 0;

		return 0;





	ret = func(arg);

	ret = func(arg);





	set_cpus_allowed(current, old_affinity);

	set_cpus_allowed_ptr(current, &old_affinity);





	return ret;

	return ret;

}

}

arch/sparc/kernel/us2e_cpufreq.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -238,12 +238,12 @@ static unsigned int us2e_freq_get(unsigned int cpu) 
		return 0;

		return 0;





	cpus_allowed = current->cpus_allowed;

	cpus_allowed = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));





	clock_tick = sparc64_get_clock_tick(cpu) / 1000;

	clock_tick = sparc64_get_clock_tick(cpu) / 1000;

	estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR);

	estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR);





	set_cpus_allowed(current, cpus_allowed);

	set_cpus_allowed_ptr(current, &cpus_allowed);





	return clock_tick / estar_to_divisor(estar);

	return clock_tick / estar_to_divisor(estar);

}

}
@@ -259,7 +259,7 @@ static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index) 
		return;

		return;





	cpus_allowed = current->cpus_allowed;

	cpus_allowed = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));





	new_freq = clock_tick = sparc64_get_clock_tick(cpu) / 1000;

	new_freq = clock_tick = sparc64_get_clock_tick(cpu) / 1000;

	new_bits = index_to_estar_mode(index);

	new_bits = index_to_estar_mode(index);
@@ -281,7 +281,7 @@ static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index) 




	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);





	set_cpus_allowed(current, cpus_allowed);

	set_cpus_allowed_ptr(current, &cpus_allowed);

}

}





static int us2e_freq_target(struct cpufreq_policy *policy,

static int us2e_freq_target(struct cpufreq_policy *policy,

arch/sparc/kernel/us3_cpufreq.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -86,12 +86,12 @@ static unsigned int us3_freq_get(unsigned int cpu) 
		return 0;

		return 0;





	cpus_allowed = current->cpus_allowed;

	cpus_allowed = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));





	reg = read_safari_cfg();

	reg = read_safari_cfg();

	ret = get_current_freq(cpu, reg);

	ret = get_current_freq(cpu, reg);





	set_cpus_allowed(current, cpus_allowed);

	set_cpus_allowed_ptr(current, &cpus_allowed);





	return ret;

	return ret;

}

}
@@ -106,7 +106,7 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index) 
		return;

		return;





	cpus_allowed = current->cpus_allowed;

	cpus_allowed = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));





	new_freq = sparc64_get_clock_tick(cpu) / 1000;

	new_freq = sparc64_get_clock_tick(cpu) / 1000;

	switch (index) {

	switch (index) {
@@ -140,7 +140,7 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index) 




	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);





	set_cpus_allowed(current, cpus_allowed);

	set_cpus_allowed_ptr(current, &cpus_allowed);

}

}





static int us3_freq_target(struct cpufreq_policy *policy,

static int us3_freq_target(struct cpufreq_policy *policy,