| commit | 63788ea9245688772d13b979bea05bd72b239aad | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Aug 12 09:22:34 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Aug 12 09:22:34 2005 -0700 |
| tree | 13f00cc8f6da1ed6c583947652bbedb2a0e27693 | |
| parent | 349188f66da2fd88f8cb2407763051d8e136c9aa [diff] | |
| parent | d7b9dfc8ea43936e6e8eec3040dcf4f110563868 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 6e4807d..b15761f 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c
@@ -334,7 +334,7 @@ { if (notscsync || !cpu_has_tsc) return; - sync_tsc(boot_cpu_id); + sync_tsc(0); } static __init int notscsync_setup(char *s)