diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 16:07:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 16:07:26 -0400 |
| commit | 09d92002718edf8ef284ec3726247acc83efbbe0 (patch) | |
| tree | 54fe60e08833214565562ce0e9cefa21c92f95e3 /arch/x86_64 | |
| parent | cb220c1af49644786944c549518b491d4c654030 (diff) | |
| parent | 3edea4833a1efcd43e1dff082bc8001fdfe74b34 (diff) | |
Merge from-linus to-akpm
Diffstat (limited to 'arch/x86_64')
| -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) |