X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=init%2Fmain.c;h=f715b9b897538cb04dc94fa900bd8c3f5d6e26e7;hb=c71d48877e6f3d5e3eb22fcaaa612081bce3d089;hp=64466ea1984c9d1b69f5e7d0a0183e72a07dbfa4;hpb=9ae21d1bb376436285cd5346d3e4b3655d6dd1b9;p=linux-2.6

diff --git a/init/main.c b/init/main.c
index 64466ea198..f715b9b897 100644
--- a/init/main.c
+++ b/init/main.c
@@ -341,7 +341,7 @@ static void __init setup_per_cpu_areas(void)
 #endif
 	ptr = alloc_bootmem(size * nr_possible_cpus);
 
-	for_each_cpu(i) {
+	for_each_possible_cpu(i) {
 		__per_cpu_offset[i] = ptr - __per_cpu_start;
 		memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
 		ptr += size;
@@ -582,7 +582,7 @@ static void __init do_initcalls(void)
 
 		result = (*call)();
 
-		if (result && (result != -ENODEV || initcall_debug)) {
+		if (result && result != -ENODEV && initcall_debug) {
 			sprintf(msgbuf, "error code %d", result);
 			msg = msgbuf;
 		}