diff -Naur -X /g/g/lib/dontdiff /spare/tmp/linux-2.5.4-pre1/arch/alpha/kernel/setup.c linux_2_5/arch/alpha/kernel/setup.c
--- /spare/tmp/linux-2.5.4-pre1/arch/alpha/kernel/setup.c	Tue Dec 25 23:39:20 2001
+++ linux_2_5/arch/alpha/kernel/setup.c	Mon Jan 21 17:19:53 2002
@@ -436,8 +436,8 @@
 
 static kdev_t srm_console_device(struct console *c)
 {
-  /* Huh? */
-        return MKDEV(TTY_MAJOR, 64 + c->index);
+	/* Huh? */
+        return mk_kdev(TTY_MAJOR, 64 + c->index);
 }
 
 static int __init srm_console_setup(struct console *co, char *options)
diff -Naur -X /g/g/lib/dontdiff /spare/tmp/linux-2.5.4-pre1/arch/alpha/mm/fault.c linux_2_5/arch/alpha/mm/fault.c
--- /spare/tmp/linux-2.5.4-pre1/arch/alpha/mm/fault.c	Mon Sep 17 23:15:02 2001
+++ linux_2_5/arch/alpha/mm/fault.c	Mon Jan 21 17:19:53 2002
@@ -196,8 +196,7 @@
  */
 out_of_memory:
 	if (current->pid == 1) {
-		current->policy |= SCHED_YIELD;
-		schedule();
+		yield();
 		down_read(&mm->mmap_sem);
 		goto survive;
 	}