merge if

1 files changed, 2 insertions, 4 deletions

diff --git a/kern/cpu_number.c b/kern/cpu_number.c
index 768d1619..4dd14a6a 100644
--- a/kern/cpu_number.c
+++ b/kern/cpu_number.c
@@ -6,9 +6,8 @@ unsigned int master_cpu = 0;	/* 'master' processor - keeps time */
 int
 cpu_number()
 {
-	if(ncpu == 1) return 0;
-	else if(lapic != 0){ 
-
+	if(ncpu == 1 | lapic == 0) return 0;
+	else{ 
 		unsigned apic_id = lapic->apic_id.r >>24;
 		int i = 0;
 		
@@ -17,5 +16,4 @@ cpu_number()
 		if(i == ncpu) return -1;
 		else return i;
 	}
-	else return 0;
 }