[Devel] Re: [PATCH 1/1] fix ifdef to shut up gcc in mm/mmap.c

[Oren Laadan]

Ughhh ... done.

Serge E. Hallyn wrote:
> 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 <serue at us.ibm.com>
> ---
>  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 */
_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers