Skip to contentSkip to conversation

fix ifdef to shut up gcc in mm/mmap.c

PATCH In review Serge E. Hallyn 2 participants 2 messages Jan 28, 2010 – Feb 4, 2010 1 message not in the archive

Subsystems (2)
Memory management Memory mapping
lore
Share & tools
lore

Serge E. Hallyn

author
#0 lore raw

PATCH 1/1 fix ifdef to shut up gcc in mm/mmap.c

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/[email protected]>
---
 mm/mmap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
mm/mmap.c +4 -4
index 0b2319f..c2451e3 100644
@@ -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 */
Signature · 1 line
1.6.1

A message that is not in the archive (sent off-list or not yet received): 20100128205333.GA5026-r/[email protected]

#2 lore raw

Ughhh ... done.

Quoted 28 lines · Serge E. Hallyn

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/[email protected]>
---
 mm/mmap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
mm/mmap.c +4 -4
index 0b2319f..c2451e3 100644
@@ -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 */