Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

[pandora-kernel.git] / arch / x86 / mm / fault_64.c

diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 1e63174..00be7f0 100644 (file)
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -549,7 +549,7 @@ no_context:
  */
 out_of_memory:
        up_read(&mm->mmap_sem);
-       if (is_init(current)) {
+       if (is_global_init(current)) {
                yield();
                goto again;
        }