patch-2.3.25 linux/arch/i386/kernel/smpboot.c

• Lines: 22
• Date: Wed Oct 27 18:40:00 1999
• Orig file: v2.3.24/linux/arch/i386/kernel/smpboot.c
• Orig date: Fri Oct 22 13:21:45 1999

diff -u --recursive --new-file v2.3.24/linux/arch/i386/kernel/smpboot.c linux/arch/i386/kernel/smpboot.c
@@ -821,8 +821,9 @@
 		 * could use the real zero-page, but it's safer
 		 * this way if some buggy code writes to this page ...
 		 */
-		apic_phys = __pa(alloc_bootmem_pages(PAGE_SIZE));
+		apic_phys = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
 		memset((void *)apic_phys, 0, PAGE_SIZE);
+		apic_phys = __pa(apic_phys);
 	}
 	set_fixmap(FIX_APIC_BASE, apic_phys);
 	dprintk("mapped APIC to %08lx (%08lx)\n", APIC_BASE, apic_phys);
@@ -836,8 +837,9 @@
 			if (smp_found_config) {
 				ioapic_phys = mp_ioapics[i].mpc_apicaddr;
 			} else {
-				ioapic_phys = __pa(alloc_bootmem_pages(PAGE_SIZE));
+				ioapic_phys = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
 				memset((void *)ioapic_phys, 0, PAGE_SIZE);
+				ioapic_phys = __pa(ioapic_phys);
 			}
 			set_fixmap(idx,ioapic_phys);
 			dprintk("mapped IOAPIC to %08lx (%08lx)\n",