UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for two arch/sh build regressions that appeared in 4.6-rc1, one 

introduced by me, and one caused by changes elsewhere.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJXDaFFAAoJELcQ+SIFb8HaqYQH/2HE4XRXv7tYULlyTiQENFNc
 m7v8R6D9KLWYlJzrDl5UGfbRDnGHzVFpyzuyJrsEhpymTtoeWif3/96H/VTWKrPq
 h1obfuVH/p8bfodnTnsWqEJa/BdmAvyaeQZ5Ec8ibfYYAOLiUuKDwFI46kZ22m2r
 m13dYoNw0F+rjYjAtlHjX3M2Sq5DvKHLN/STONRtTXxE3FVHOGCQ6SGuasd9JkEr
 rTGRVE2Rkj7Q3BNCOK3eu0+LFkxJFE41nVdk2d/iRRyt9uwXveN8Yk5V/kX/oINk
 1zXfGmtpOiIMs2zH5oNrHwXqWBfEzEXH7XNJOoGVrAzg/6JxMWbQXbDwMyUPjCA=
 =qnfN
 -----END PGP SIGNATURE-----

Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh

Pull arch/sh fixes from Rich Felker:
 "Fixes for two arch/sh build regressions that appeared in 4.6-rc1, one
  introduced by me, and one caused by changes elsewhere"

* tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh:
  sh: fix function signature of cpu_coregroup_mask to match pointer type
  sh: fix smp-shx3 build regression from removal of arch localtimer
This commit is contained in:
Linus Torvalds 2016-04-13 13:02:06 -07:00
parent 5b523ff281 ccc7d5a1cd
commit 90de6800c2
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sh/include/asm/smp.h
View File

@ -34,11 +34,6 @@ enum {
DECLARE_PER_CPU(int, cpu_state);
void smp_message_recv(unsigned int msg);
void smp_timer_broadcast(const struct cpumask *mask);
void local_timer_interrupt(void);
void local_timer_setup(unsigned int cpu);
void local_timer_stop(unsigned int cpu);
void arch_send_call_function_single_ipi(int cpu);
void arch_send_call_function_ipi_mask(const struct cpumask *mask);

2
arch/sh/include/asm/topology.h
View File

@ -17,7 +17,7 @@
#define mc_capable() (1)
const struct cpumask *cpu_coregroup_mask(unsigned int cpu);
const struct cpumask *cpu_coregroup_mask(int cpu);
extern cpumask_t cpu_core_map[NR_CPUS];

2
arch/sh/kernel/cpu/sh4a/smp-shx3.c
View File

@ -73,8 +73,6 @@ static void shx3_prepare_cpus(unsigned int max_cpus)
{
int i;
local_timer_setup(0);
BUILD_BUG_ON(SMP_MSG_NR >= 8);
for (i = 0; i < SMP_MSG_NR; i++)

4
arch/sh/kernel/topology.c
View File

@ -21,7 +21,7 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
cpumask_t cpu_core_map[NR_CPUS];
EXPORT_SYMBOL(cpu_core_map);
static cpumask_t cpu_coregroup_map(unsigned int cpu)
static cpumask_t cpu_coregroup_map(int cpu)
{
/*
* Presently all SH-X3 SMP cores are multi-cores, so just keep it
@ -30,7 +30,7 @@ static cpumask_t cpu_coregroup_map(unsigned int cpu)
return *cpu_possible_mask;
}
const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
const struct cpumask *cpu_coregroup_mask(int cpu)
{
return &cpu_core_map[cpu];
}