diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-16 10:11:02 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-16 10:11:02 -1000 |
| commit | bcf44bfe5e929468b781082889d4b17245aff3ca (patch) | |
| tree | 497e0a833998b024c4c745cbd524c8bbd4fddc2d /arch/powerpc/kernel | |
| parent | d14aef3872bd25af5355a10ad5235556ac83fcfd (diff) | |
| parent | b6220ad66bcd4a50737eb3c08e9466aa44f3bc98 (diff) | |
| download | blackbird-op-linux-bcf44bfe5e929468b781082889d4b17245aff3ca.tar.gz blackbird-op-linux-bcf44bfe5e929468b781082889d4b17245aff3ca.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"A cpufreq lockup fix and a compiler warning fix"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched: Fix compiler warnings
x86, tsc: Fix cpufreq lockup
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 51a3ff78838a..1007fb802e6b 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -747,7 +747,7 @@ int setup_profiling_timer(unsigned int multiplier) #ifdef CONFIG_SCHED_SMT /* cpumask of CPUs with asymetric SMT dependancy */ -static const int powerpc_smt_flags(void) +static int powerpc_smt_flags(void) { int flags = SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES; |
