Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff0ce684 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "[PATCH] x86-64: fix x86_64-mm-sched-clock-share" 



This reverts commit 184c44d2.

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: default avatarDave 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a07921bc

include/linux/cpufreq.h

+3 −16
Original line number Diff line number Diff line
@@ -32,15 +32,7 @@ 
 *                     CPUFREQ NOTIFIER INTERFACE                    *

 *********************************************************************/



#ifdef CONFIG_CPU_FREQ

int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);

#else

static inline int cpufreq_register_notifier(struct notifier_block *nb,

						unsigned int list)

{

	return 0;

}

#endif

int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);



#define CPUFREQ_TRANSITION_NOTIFIER	(0)
@@ -268,22 +260,17 @@ struct freq_attr { 
int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);

int cpufreq_update_policy(unsigned int cpu);



/* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */

unsigned int cpufreq_get(unsigned int cpu);



/*

 * query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it

 */

/* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */

#ifdef CONFIG_CPU_FREQ

unsigned int cpufreq_quick_get(unsigned int cpu);

unsigned int cpufreq_get(unsigned int cpu);

#else

static inline unsigned int cpufreq_quick_get(unsigned int cpu)

{

	return 0;

}

static inline unsigned int cpufreq_get(unsigned int cpu)

{

	return 0;

}

#endif