Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (fafa3a3f) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/x86/kernel/tsc.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -358,6 +358,7 @@ static cycle_t read_tsc(void)
	ret : clocksource_tsc.cycle_last;		ret : clocksource_tsc.cycle_last;
	}		}

			#ifdef CONFIG_X86_64
	static cycle_t __vsyscall_fn vread_tsc(void)		static cycle_t __vsyscall_fn vread_tsc(void)
	{		{
	cycle_t ret = (cycle_t)vget_cycles();		cycle_t ret = (cycle_t)vget_cycles();
	@@ -365,6 +366,7 @@ static cycle_t __vsyscall_fn vread_tsc(void)
	return ret >= __vsyscall_gtod_data.clock.cycle_last ?		return ret >= __vsyscall_gtod_data.clock.cycle_last ?
	ret : __vsyscall_gtod_data.clock.cycle_last;		ret : __vsyscall_gtod_data.clock.cycle_last;
	}		}
			#endif

	static struct clocksource clocksource_tsc = {		static struct clocksource clocksource_tsc = {
	.name = "tsc",		.name = "tsc",