patch-2.4.0-test10 linux/arch/ia64/ia32/binfmt_elf32.c

• Lines: 18
• Date: Mon Oct 9 17:54:53 2000
• Orig file: v2.4.0-test9/linux/arch/ia64/ia32/binfmt_elf32.c
• Orig date: Mon Aug 7 21:02:27 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/ia64/ia32/binfmt_elf32.c linux/arch/ia64/ia32/binfmt_elf32.c
@@ -52,7 +52,7 @@
 	pte_t * pte;
 
 	if (page_count(page) != 1)
-		printk("mem_map disagrees with %p at %08lx\n", page, address);
+		printk("mem_map disagrees with %p at %08lx\n", (void *) page, address);
 	pgd = pgd_offset(tsk->mm, address);
 	pmd = pmd_alloc(pgd, address);
 	if (!pmd) {
@@ -120,6 +120,8 @@
 		: "r" ((ulong)IA32_FCR_DEFAULT));
 	__asm__("mov ar.fir = r0");
 	__asm__("mov ar.fdr = r0");
+	__asm__("mov %0=ar.k0 ;;" : "=r" (current->thread.old_iob));
+	__asm__("mov ar.k0=%0 ;;" :: "r"(IA32_IOBASE));
 	/* TSS */
 	__asm__("mov ar.k1 = %0"
 		: /* no outputs */