aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-15 16:07:26 -0400
committerLen Brown <len.brown@intel.com>2005-08-15 16:07:26 -0400
commit09d92002718edf8ef284ec3726247acc83efbbe0 (patch)
tree54fe60e08833214565562ce0e9cefa21c92f95e3 /arch
parentcb220c1af49644786944c549518b491d4c654030 (diff)
parent3edea4833a1efcd43e1dff082bc8001fdfe74b34 (diff)
Merge from-linus to-akpm
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/smpboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 6e4807d64d4..b15761ff410 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -334,7 +334,7 @@ static void __cpuinit tsc_sync_wait(void)
{
if (notscsync || !cpu_has_tsc)
return;
- sync_tsc(boot_cpu_id);
+ sync_tsc(0);
}
static __init int notscsync_setup(char *s)