Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit bcf44bfe5e92 · 2014-07-16T10:11:02.000-10:00
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
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
@@ -275,7 +275,7 @@ void store_cpu_topology(unsigned int cpuid)
 		cpu_topology[cpuid].socket_id, mpidr);
 }
 
-static inline const int cpu_corepower_flags(void)
+static inline int cpu_corepower_flags(void)
 {
 	return SD_SHARE_PKG_RESOURCES  | SD_SHARE_POWERDOMAIN;
 }
diff --git 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;
 
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
@@ -920,9 +920,9 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 		tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq->new);
 		if (!(freq->flags & CPUFREQ_CONST_LOOPS))
 			mark_tsc_unstable("cpufreq changes");
-	}
 
-	set_cyc2ns_scale(tsc_khz, freq->cpu);
+		set_cyc2ns_scale(tsc_khz, freq->cpu);
+	}
 
 	return 0;
 }
diff --git a/include/linux/sched.h b/include/linux/sched.h
@@ -872,21 +872,21 @@ enum cpu_idle_type {
 #define SD_NUMA			0x4000	/* cross-node balancing */
 
 #ifdef CONFIG_SCHED_SMT
-static inline const int cpu_smt_flags(void)
+static inline int cpu_smt_flags(void)
 {
 	return SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES;
 }
 #endif
 
 #ifdef CONFIG_SCHED_MC
-static inline const int cpu_core_flags(void)
+static inline int cpu_core_flags(void)
 {
 	return SD_SHARE_PKG_RESOURCES;
 }
 #endif
 
 #ifdef CONFIG_NUMA
-static inline const int cpu_numa_flags(void)
+static inline int cpu_numa_flags(void)
 {
 	return SD_NUMA;
 }
@@ -999,7 +999,7 @@ void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms);
 bool cpus_share_cache(int this_cpu, int that_cpu);
 
 typedef const struct cpumask *(*sched_domain_mask_f)(int cpu);
-typedef const int (*sched_domain_flags_f)(void);
+typedef int (*sched_domain_flags_f)(void);
 
 #define SDTL_OVERLAP	0x01
 

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ void store_cpu_topology(unsigned int cpuid)`
`275`	`275`	`cpu_topology[cpuid].socket_id, mpidr);`
`276`	`276`	`}`
`277`	`277`
`278`		`-static inline const int cpu_corepower_flags(void)`
	`278`	`+static inline int cpu_corepower_flags(void)`
`279`	`279`	`{`
`280`	`280`	`return SD_SHARE_PKG_RESOURCES \| SD_SHARE_POWERDOMAIN;`
`281`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ int setup_profiling_timer(unsigned int multiplier)`
`747`	`747`
`748`	`748`	`#ifdef CONFIG_SCHED_SMT`
`749`	`749`	`/* cpumask of CPUs with asymetric SMT dependancy */`
`750`		`-static const int powerpc_smt_flags(void)`
	`750`	`+static int powerpc_smt_flags(void)`
`751`	`751`	`{`
`752`	`752`	`int flags = SD_SHARE_CPUCAPACITY \| SD_SHARE_PKG_RESOURCES;`
`753`	`753`
Original file line number	Diff line number	Diff line change
`@@ -872,21 +872,21 @@ enum cpu_idle_type {`
`872`	`872`	`#define SD_NUMA 0x4000 /* cross-node balancing */`
`873`	`873`
`874`	`874`	`#ifdef CONFIG_SCHED_SMT`
`875`		`-static inline const int cpu_smt_flags(void)`
	`875`	`+static inline int cpu_smt_flags(void)`
`876`	`876`	`{`
`877`	`877`	`return SD_SHARE_CPUCAPACITY \| SD_SHARE_PKG_RESOURCES;`
`878`	`878`	`}`
`879`	`879`	`#endif`
`880`	`880`
`881`	`881`	`#ifdef CONFIG_SCHED_MC`
`882`		`-static inline const int cpu_core_flags(void)`
	`882`	`+static inline int cpu_core_flags(void)`
`883`	`883`	`{`
`884`	`884`	`return SD_SHARE_PKG_RESOURCES;`
`885`	`885`	`}`
`886`	`886`	`#endif`
`887`	`887`
`888`	`888`	`#ifdef CONFIG_NUMA`
`889`		`-static inline const int cpu_numa_flags(void)`
	`889`	`+static inline int cpu_numa_flags(void)`
`890`	`890`	`{`
`891`	`891`	`return SD_NUMA;`
`892`	`892`	`}`
`@@ -999,7 +999,7 @@ void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms);`
`999`	`999`	`bool cpus_share_cache(int this_cpu, int that_cpu);`
`1000`	`1000`
`1001`	`1001`	`typedef const struct cpumask (sched_domain_mask_f)(int cpu);`
`1002`		`-typedef const int (*sched_domain_flags_f)(void);`
	`1002`	`+typedef int (*sched_domain_flags_f)(void);`
`1003`	`1003`
`1004`	`1004`	`#define SDTL_OVERLAP 0x01`
`1005`	`1005`