Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / kernel / power / pmdisk.c

diff --git a/kernel/power/pmdisk.c b/kernel/power/pmdisk.c
index dd474cc..d4c20e0 100644 (file)
--- a/kernel/power/pmdisk.c
+++ b/kernel/power/pmdisk.c
@@ -792,7 +792,7 @@ static int __init relocate_pagedir(void)
        }
 
        err = -ENOMEM;
-       while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order))) {
+       while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order)) != NULL) {
                if (!does_collide_order(old_pagedir, (unsigned long)m,
                                        pagedir_order)) {
                        pm_pagedir_nosave =