Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert "[PATCH] x86-64: fix x86_64-mm-sched-clock-share"
This reverts commit 184c44d2049c4db7ef6ec65794546954da2c6a0e.
As noted by Dave Jones:
"Linus, please revert the above cset. It doesn't seem to be
necessary (it was added to fix a miscompile in 'make allnoconfig'
which doesn't seem to be repeatable with it reverted) and actively
breaks the ARM SA1100 framebuffer driver."
Requested-by: Dave Jones <davej@redhat.com>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+3
-16
+3
-16
include/linux/cpufreq.h
+3
-16
include/linux/cpufreq.h
···
32
32
* CPUFREQ NOTIFIER INTERFACE *
33
33
*********************************************************************/
34
34
35
-
#ifdef CONFIG_CPU_FREQ
36
35
int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);
37
-
#else
38
-
static inline int cpufreq_register_notifier(struct notifier_block *nb,
39
-
unsigned int list)
40
-
{
41
-
return 0;
42
-
}
43
-
#endif
44
36
int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
45
37
46
38
#define CPUFREQ_TRANSITION_NOTIFIER (0)
···
260
268
int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
261
269
int cpufreq_update_policy(unsigned int cpu);
262
270
271
+
/* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */
272
+
unsigned int cpufreq_get(unsigned int cpu);
263
273
264
-
/*
265
-
* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it
266
-
*/
274
+
/* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */
267
275
#ifdef CONFIG_CPU_FREQ
268
276
unsigned int cpufreq_quick_get(unsigned int cpu);
269
-
unsigned int cpufreq_get(unsigned int cpu);
270
277
#else
271
278
static inline unsigned int cpufreq_quick_get(unsigned int cpu)
272
-
{
273
-
return 0;
274
-
}
275
-
static inline unsigned int cpufreq_get(unsigned int cpu)
276
279
{
277
280
return 0;
278
281
}