diff -Napur -X /home/jbarnes/dontdiff linux-2.6.11-rc2-mm1-mhp1/init/main.c linux-2.6.11-rc2-mm1-mhp1-work/init/main.c
--- linux-2.6.11-rc2-mm1-mhp1/init/main.c	2005-02-01 10:37:28.000000000 -0800
+++ linux-2.6.11-rc2-mm1-mhp1-work/init/main.c	2005-02-01 10:43:28.000000000 -0800
@@ -427,9 +427,11 @@ asmlinkage void __init start_kernel(void
  * Interrupts are still disabled. Do necessary setups, then
  * enable them
  */
+#ifndef CONFIG_IA64
 	console_setup("ttyS0,38400");
 	serial8250_console_init();
 	printk("early printk enabled\n");
+#endif
 	
 	lock_kernel();
 	page_address_init();
diff -Napur -X /home/jbarnes/dontdiff linux-2.6.11-rc2-mm1-mhp1/mm/mmigrate.c linux-2.6.11-rc2-mm1-mhp1-work/mm/mmigrate.c
--- linux-2.6.11-rc2-mm1-mhp1/mm/mmigrate.c	2005-02-01 10:37:28.000000000 -0800
+++ linux-2.6.11-rc2-mm1-mhp1-work/mm/mmigrate.c	2005-02-01 10:42:04.000000000 -0800
@@ -329,6 +329,7 @@ generic_migrate_page(struct page *page, 
 		newpage->mapping = NULL;
 		/* fall thru */
 	case 0:
+		break;
 		/* fall thru */
 	}