diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-14 19:09:22 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-14 19:09:22 -0400 |
| commit | 68984aedabf2552aeb21b9ed232cb8f685444e3a (patch) | |
| tree | 803c93116818a1bdf9566c7b00eff7d373567f80 /arch/x86_64/kernel/smpboot.c | |
| parent | 4a6d87f1db06c9670251d6c72a89319e7d1cbaee (diff) | |
| parent | b4b08e581fac8e0ba9ae348bdc13246c9798c99e (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/x86_64/kernel/smpboot.c')
| -rw-r--r-- | arch/x86_64/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 6e4807d64d46..b15761ff4101 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) | |||
| 334 | { | 334 | { |
| 335 | if (notscsync || !cpu_has_tsc) | 335 | if (notscsync || !cpu_has_tsc) |
| 336 | return; | 336 | return; |
| 337 | sync_tsc(boot_cpu_id); | 337 | sync_tsc(0); |
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | static __init int notscsync_setup(char *s) | 340 | static __init int notscsync_setup(char *s) |