# That code comes from the out_of_memory section; in 2.4 it was correct
# to put it for "default:", since it was called when handle_mm_fault()
# return value was != 0, 1, 2, i.e. it was 3, OOM (but the i386
# code put it out of line, for better performance).
# Here, instead, the OOM case is handled on its own, so if handle_mm_fault() !=
# from the listed cases we must BUG().
# 
# Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam at yahoo.it>
Index: um/arch/um/kernel/trap_kern.c
===================================================================
--- um.orig/arch/um/kernel/trap_kern.c	2004-08-06 15:02:45.000000000 -0400
+++ um/arch/um/kernel/trap_kern.c	2004-08-12 16:31:59.000000000 -0400
@@ -74,13 +74,7 @@
 			err = -ENOMEM;
 			goto out_of_memory;
 		default:
-			if (current->pid == 1) {
-				up_read(&mm->mmap_sem);
-				yield();
-				down_read(&mm->mmap_sem);
-				goto survive;
-			}
-			goto out;
+			BUG();
 		}
 		pte = pte_offset_kernel(pmd, page);
 	} while(!pte_present(*pte));
@@ -103,7 +97,6 @@
 		down_read(&mm->mmap_sem);
 		goto survive;
 	}
-	err = -ENOMEM;
 	goto out;
 }