summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2006-01-03 13:51:07 +0100
committerAnton Altaparmakov <aia21@cantab.net>2006-01-03 13:51:07 +0100
commitd087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (patch)
treec2db1b4958bbf617a25398b7ef93d82006b26a17 /arch/ppc/kernel
parentMerge branch 'master' of /usr/src/ntfs-2.6/ (diff)
parentLinux v2.6.15 (diff)
downloadlinux-d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b.tar.xz
linux-d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b.zip
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r--arch/ppc/kernel/smp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
index 43b8fc2ca591..becbfa397556 100644
--- a/arch/ppc/kernel/smp.c
+++ b/arch/ppc/kernel/smp.c
@@ -301,6 +301,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
/* Probe platform for CPUs: always linear. */
num_cpus = smp_ops->probe();
+
+ if (num_cpus < 2)
+ smp_tb_synchronized = 1;
+
for (i = 0; i < num_cpus; ++i)
cpu_set(i, cpu_possible_map);