diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-13 13:02:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-13 13:02:06 -0700 |
| commit | 90de6800c240dfe089e254116a7c055e70b709fd (patch) | |
| tree | 7ceca78ebcc056291a92fe3a8be010a2dcf5fc63 /arch/sh/include/asm/topology.h | |
| parent | 5b523ff281b9f97ec75d526e2750381c6e8c9326 (diff) | |
| parent | ccc7d5a1cdae78ccd623540dc87e281135a1c053 (diff) | |
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
Diffstat (limited to 'arch/sh/include/asm/topology.h')
| -rw-r--r-- | arch/sh/include/asm/topology.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h index b0a282d65f6a..358e3f516ef6 100644 --- a/arch/sh/include/asm/topology.h +++ b/arch/sh/include/asm/topology.h @@ -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]; |