Obvious updates to the alpha port, for recent 2.5.[123] API changes.

More changes are needed to the task struct/scheduler area before
the alpha port will boot again; this flushes the easy stuff.

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 94a3c1a18d7ac09789846ff93cd89021728e00c6..58c0ee067475e1dd4d31f3f90961d1c6556185fe 100644 (file)
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -436,8 +436,8 @@ static void srm_console_write(struct console *co, const char *s,
 
 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 --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index ca766f2050c65d525aa54957bb08d34368941cb4..1aa7a84c3f9c28503b71aa15655346c98e4e83bf 100644 (file)
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -196,8 +196,7 @@ no_context:
  */
 out_of_memory:
        if (current->pid == 1) {
-               current->policy |= SCHED_YIELD;
-               schedule();
+               yield();
                down_read(&mm->mmap_sem);
                goto survive;
        }