All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] fix ifdef to shut up gcc in mm/mmap.c
@ 2010-01-28 20:53 Serge E. Hallyn
       [not found] ` <20100128205333.GA5026-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Serge E. Hallyn @ 2010-01-28 20:53 UTC (permalink / raw)
  To: Oren Laadan; +Cc: Linux Containers

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-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] fix ifdef to shut up gcc in mm/mmap.c
       [not found] ` <20100128205333.GA5026-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
@ 2010-02-04 17:38   ` Oren Laadan
  0 siblings, 0 replies; 2+ messages in thread
From: Oren Laadan @ 2010-02-04 17:38 UTC (permalink / raw)
  To: Serge E. Hallyn; +Cc: Linux Containers


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-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  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 */

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-02-04 17:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-28 20:53 [PATCH 1/1] fix ifdef to shut up gcc in mm/mmap.c Serge E. Hallyn
     [not found] ` <20100128205333.GA5026-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-02-04 17:38   ` Oren Laadan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.