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

Commit 2272b0e0 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

[PATCH] i386: make x86_64 tsc header require i386 rather than vice-versa 



Prior to commit 95492e46 ([PATCH] x86:
rewrite SMP TSC sync code), the headers in asm-i386 did not really require
anything in include/asm-x86_64.  This means that distributions such as
fedora did not include asm-x86_64 in kernel-devel headers for i386.  Ingo's
commit changed that, and broke things.  This is easy enough to hack around
in package builds by just including asm-x86_64 on i386, but that's kind of
annoying.  If anything, x86_64 should depend upon i386, not the other way
around.

This patch changes it so that asm-x86_64/tsc.h includes asm-i386/tsc.h,
rather than vice-versa.

Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e585047e

include/asm-i386/tsc.h

+67 −1
Original line number Diff line number Diff line 
#include <asm-x86_64/tsc.h>
 
/*

 * linux/include/asm-i386/tsc.h

 *

 * i386 TSC related functions

 */

#ifndef _ASM_i386_TSC_H

#define _ASM_i386_TSC_H



#include <asm/processor.h>



/*

 * Standard way to access the cycle counter.

 */

typedef unsigned long long cycles_t;



extern unsigned int cpu_khz;

extern unsigned int tsc_khz;



static inline cycles_t get_cycles(void)

{

	unsigned long long ret = 0;



#ifndef CONFIG_X86_TSC

	if (!cpu_has_tsc)

		return 0;

#endif



#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC)

	rdtscll(ret);

#endif

	return ret;

}



/* Like get_cycles, but make sure the CPU is synchronized. */

static __always_inline cycles_t get_cycles_sync(void)

{

	unsigned long long ret;

#ifdef X86_FEATURE_SYNC_RDTSC

	unsigned eax;



	/*

	 * Don't do an additional sync on CPUs where we know

	 * RDTSC is already synchronous:

	 */

	alternative_io("cpuid", ASM_NOP2, X86_FEATURE_SYNC_RDTSC,

			  "=a" (eax), "0" (1) : "ebx","ecx","edx","memory");

#else

	sync_core();

#endif

	rdtscll(ret);



	return ret;

}



extern void tsc_init(void);

extern void mark_tsc_unstable(void);

extern int unsynchronized_tsc(void);

extern void init_tsc_clocksource(void);



/*

 * Boot-time check whether the TSCs are synchronized across

 * all CPUs/cores:

 */

extern void check_tsc_sync_source(int cpu);

extern void check_tsc_sync_target(void);



#endif

include/asm-x86_64/tsc.h

+1 −67
Original line number Diff line number Diff line 
/*

 * linux/include/asm-x86_64/tsc.h

 *

 * x86_64 TSC related functions

 */

#ifndef _ASM_x86_64_TSC_H

#define _ASM_x86_64_TSC_H



#include <asm/processor.h>



/*

 * Standard way to access the cycle counter.

 */

typedef unsigned long long cycles_t;



extern unsigned int cpu_khz;

extern unsigned int tsc_khz;



static inline cycles_t get_cycles(void)

{

	unsigned long long ret = 0;



#ifndef CONFIG_X86_TSC

	if (!cpu_has_tsc)

		return 0;

#endif



#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC)

	rdtscll(ret);

#endif

	return ret;

}



/* Like get_cycles, but make sure the CPU is synchronized. */

static __always_inline cycles_t get_cycles_sync(void)

{

	unsigned long long ret;

#ifdef X86_FEATURE_SYNC_RDTSC

	unsigned eax;



	/*

	 * Don't do an additional sync on CPUs where we know

	 * RDTSC is already synchronous:

	 */

	alternative_io("cpuid", ASM_NOP2, X86_FEATURE_SYNC_RDTSC,

			  "=a" (eax), "0" (1) : "ebx","ecx","edx","memory");

#else

	sync_core();

#endif

	rdtscll(ret);



	return ret;

}



extern void tsc_init(void);

extern void mark_tsc_unstable(void);

extern int unsynchronized_tsc(void);

extern void init_tsc_clocksource(void);



/*

 * Boot-time check whether the TSCs are synchronized across

 * all CPUs/cores:

 */

extern void check_tsc_sync_source(int cpu);

extern void check_tsc_sync_target(void);



#endif
 
#include <asm-i386/tsc.h>