diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 08:18:02 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 08:18:02 +0100 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /arch/x86/kernel/tsc.c | |
| parent | sh: Fix up the shared IRQ demuxer's control bit testing logic. (diff) | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| download | linux-0803d540db06f53acd2fabf1347d5b665218f14a.tar.xz linux-0803d540db06f53acd2fabf1347d5b665218f14a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 161bb850fc47..62348e4fd8d1 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -759,7 +759,7 @@ __cpuinit int unsynchronized_tsc(void) if (!cpu_has_tsc || tsc_unstable) return 1; -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_SMP if (apic_is_clustered_box()) return 1; #endif |