diff options
| author | Len Brown | 2005-08-15 22:07:26 +0200 |
|---|---|---|
| committer | Len Brown | 2005-08-15 22:07:26 +0200 |
| commit | 09d92002718edf8ef284ec3726247acc83efbbe0 (patch) | |
| tree | 54fe60e08833214565562ce0e9cefa21c92f95e3 /arch | |
| parent | Merge 'acpi-2.6.12' branch into to-akpm (diff) | |
| parent | [PATCH] intelfb/fbdev: Save info->flags in a local variable (diff) | |
| download | kernel-qcow2-linux-09d92002718edf8ef284ec3726247acc83efbbe0.tar.gz kernel-qcow2-linux-09d92002718edf8ef284ec3726247acc83efbbe0.tar.xz kernel-qcow2-linux-09d92002718edf8ef284ec3726247acc83efbbe0.zip | |
Merge from-linus to-akpm
Diffstat (limited to 'arch')
| -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) { if (notscsync || !cpu_has_tsc) return; - sync_tsc(boot_cpu_id); + sync_tsc(0); } static __init int notscsync_setup(char *s) |