Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6.git] / kernel / cpu.c
index f5f9485b8c0f9a30f4084b0c9a8846f74e05d72d..6ba0f1ecb21230de60f6ab9fd7b2f58907b48d55 100644 (file)
@@ -401,6 +401,7 @@ int disable_nonboot_cpus(void)
                        break;
                }
        }
+
        if (!error) {
                BUG_ON(num_online_cpus() > 1);
                /* Make sure the CPUs won't be enabled by someone else */