diff --git a/i386/i386/cpu_number.h b/i386/i386/cpu_number.h
index 6aac3225..16a5b7f8 100644
--- a/i386/i386/cpu_number.h
+++ b/i386/i386/cpu_number.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -50,7 +50,6 @@
 		test reg, reg; \
 		jz 0f; \
 		movl 0x20(reg), reg; \
-		shrl $24, reg; \
 		movl apic2kernel(,reg,4), reg; \
 		0:
 #endif
diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c
index ad68d3cb..dea8255c 100644
--- a/i386/i386/mp_desc.c
+++ b/i386/i386/mp_desc.c
@@ -528,7 +528,7 @@ start_other_cpus(void)
 {
     int cpu;
     vm_offset_t	stack_start;
-    int apic_id = lapic->apic_id.r >>24;
+    int apic_id = lapic->apic_id.r;
     extern pt_entry_t *kernel_page_dir;
     extern int nb_direct_value;
     int i = 0;