1. For some reason there were two lines worth of spaces at the end
of each line
2. #ifdef a && b doesn't please gcc.  use #if defined() && defined()

Signed-off-by: Serge E. Hallyn <[email protected]>
---
 mm/mmap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 0b2319f..c2451e3 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2324,10 +2324,10 @@ int special_mapping_restore(struct ckpt_ctx *ctx,
         * Even that, is very basic - call arch_setup_additional_pages
         * requiring the same mapping (start address) as before.
         */
-#ifdef CONFIG_X86_64 && CONFIG_COMPAT                                          
                                                                                
                                                  
-       if (test_thread_flag(TIF_IA32))                                         
                                                                                
                                                  
-               return syscall32_setup_pages(NULL, h->vm_start, 0);             
                                                                                
                                                  
-#endif                                                                         
                                                                                
                                                  
+#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
+       if (test_thread_flag(TIF_IA32))
+               return syscall32_setup_pages(NULL, h->vm_start, 0);
+#endif
        return arch_setup_additional_pages(NULL, h->vm_start, 0);
 }
 #else /* !CONFIG_CHECKPOINT */
-- 
1.6.1

_______________________________________________
Containers mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/containers

_______________________________________________
Devel mailing list
[email protected]
https://openvz.org/mailman/listinfo/devel

Reply via email to