From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Fri, 19 Aug 2011 14:01:51 +0000 (+0200)
Subject: Style and comment fixes, no code changes
X-Git-Tag: v4.7~327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72a5848741a1d64badc1d88f7424cd9f357842f4;p=strace

Style and comment fixes, no code changes

* mem.c: Indent includes to show nesting better.
  (addtileflags): Fix style of this function definition;
  correct wrong endif comment, add another endif comment.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---

diff --git a/mem.c b/mem.c
index 56c20cc5..f0ccfc79 100644
--- a/mem.c
+++ b/mem.c
@@ -40,13 +40,13 @@
 #include <sys/mman.h>
 
 #if defined(LINUX) && defined(I386)
-#include <asm/ldt.h>
+# include <asm/ldt.h>
 # ifdef HAVE_STRUCT_USER_DESC
 #  define modify_ldt_ldt_s user_desc
 # endif
 #endif
 #if defined(LINUX) && defined(SH64)
-#include <asm/page.h>	    /* for PAGE_SHIFT */
+# include <asm/page.h>	    /* for PAGE_SHIFT */
 #endif
 
 #ifdef HAVE_LONG_LONG_OFF_T
@@ -195,10 +195,8 @@ static const struct xlat mmap_flags[] = {
 };
 
 #ifdef TILE
-static
-int
-addtileflags(flags)
-long flags;
+static int
+addtileflags(long flags)
 {
 	long home = flags & _MAP_CACHE_MKHOME(_MAP_CACHE_HOME_MASK);
 	flags &= ~_MAP_CACHE_MKHOME(_MAP_CACHE_HOME_MASK);
@@ -269,7 +267,7 @@ int sys_old_mmap(struct tcb *tcp)
 {
 	long u_arg[6];
 
-#if	defined(IA64)
+#if defined(IA64)
 	int i, v;
 	/*
 	 *  IA64 processes never call this routine, they only use the
@@ -306,10 +304,10 @@ int sys_old_mmap(struct tcb *tcp)
 # endif
 	if (umoven(tcp, tcp->u_arg[0], sizeof u_arg, (char *) u_arg) == -1)
 		return 0;
-#endif	// defined(IA64)
+#endif /* !IA64 && !SH[64] */
 	return print_mmap(tcp, u_arg, u_arg[5]);
 }
-#endif
+#endif /* LINUX */
 
 int
 sys_mmap(struct tcb *tcp)