Commit 90de6800 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 5b523ff2 ccc7d5a1
...@@ -34,11 +34,6 @@ enum { ...@@ -34,11 +34,6 @@ enum {
DECLARE_PER_CPU(int, cpu_state); DECLARE_PER_CPU(int, cpu_state);
void smp_message_recv(unsigned int msg); 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_single_ipi(int cpu);
void arch_send_call_function_ipi_mask(const struct cpumask *mask); void arch_send_call_function_ipi_mask(const struct cpumask *mask);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define mc_capable() (1) #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]; extern cpumask_t cpu_core_map[NR_CPUS];
......
...@@ -73,8 +73,6 @@ static void shx3_prepare_cpus(unsigned int max_cpus) ...@@ -73,8 +73,6 @@ static void shx3_prepare_cpus(unsigned int max_cpus)
{ {
int i; int i;
local_timer_setup(0);
BUILD_BUG_ON(SMP_MSG_NR >= 8); BUILD_BUG_ON(SMP_MSG_NR >= 8);
for (i = 0; i < SMP_MSG_NR; i++) for (i = 0; i < SMP_MSG_NR; i++)
......
...@@ -21,7 +21,7 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices); ...@@ -21,7 +21,7 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
cpumask_t cpu_core_map[NR_CPUS]; cpumask_t cpu_core_map[NR_CPUS];
EXPORT_SYMBOL(cpu_core_map); 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 * 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) ...@@ -30,7 +30,7 @@ static cpumask_t cpu_coregroup_map(unsigned int cpu)
return *cpu_possible_mask; 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]; return &cpu_core_map[cpu];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment