Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

torvalds · torvalds · commit fafa3a3f1672 · 2008-07-15T16:29:18.000-07:00
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix TSC build error on 32bit
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
@@ -358,13 +358,15 @@ static cycle_t read_tsc(void)
 		ret : clocksource_tsc.cycle_last;
 }
 
+#ifdef CONFIG_X86_64
 static cycle_t __vsyscall_fn vread_tsc(void)
 {
 	cycle_t ret = (cycle_t)vget_cycles();
 
 	return ret >= __vsyscall_gtod_data.clock.cycle_last ?
 		ret : __vsyscall_gtod_data.clock.cycle_last;
 }
+#endif
 
 static struct clocksource clocksource_tsc = {
 	.name                   = "tsc",

Original file line number	Diff line number	Diff line change
`@@ -358,13 +358,15 @@ static cycle_t read_tsc(void)`
`358`	`358`	`ret : clocksource_tsc.cycle_last;`
`359`	`359`	`}`
`360`	`360`
	`361`	`+#ifdef CONFIG_X86_64`
`361`	`362`	`static cycle_t __vsyscall_fn vread_tsc(void)`
`362`	`363`	`{`
`363`	`364`	`cycle_t ret = (cycle_t)vget_cycles();`
`364`	`365`
`365`	`366`	`return ret >= __vsyscall_gtod_data.clock.cycle_last ?`
`366`	`367`	`ret : __vsyscall_gtod_data.clock.cycle_last;`
`367`	`368`	`}`
	`369`	`+#endif`
`368`	`370`
`369`	`371`	`static struct clocksource clocksource_tsc = {`
`370`	`372`	`.name = "tsc",`