From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: [PATCH 1/1] fix ifdef to shut up gcc in mm/mmap.c Date: Thu, 28 Jan 2010 14:53:33 -0600 Message-ID: <20100128205333.GA5026@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Oren Laadan Cc: Linux Containers List-Id: containers.vger.kernel.org 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 --- 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