From: Denys Vlasenko Date: Wed, 20 Feb 2013 11:38:14 +0000 (+0100) Subject: Use the same style of includes in linux/*/* files X-Git-Tag: v4.8~134 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bfb198db17d9a6b83f104d4f1e184664db78391;p=strace Use the same style of includes in linux/*/* files While at it, fix some comments which say "we use i386 syscalls/ioctls/errnos" but in reality common ones are used. Signed-off-by: Denys Vlasenko --- diff --git a/defs.h b/defs.h index e33c420a..8f397126 100644 --- a/defs.h +++ b/defs.h @@ -358,17 +358,13 @@ struct arm_pt_regs { #if defined(I386) extern struct user_regs_struct i386_regs; -#endif -#if defined(IA64) +#elif defined(IA64) extern long ia32; -#endif -#if defined(SPARC) || defined(SPARC64) +#elif defined(SPARC) || defined(SPARC64) extern struct pt_regs sparc_regs; -#endif -#if defined(ARM) +#elif defined(ARM) extern struct pt_regs arm_regs; -#endif -#if defined(TILE) +#elif defined(TILE) extern struct pt_regs tile_regs; #endif diff --git a/linux/arm/errnoent1.h b/linux/arm/errnoent1.h index a8948276..2ec40614 100644 --- a/linux/arm/errnoent1.h +++ b/linux/arm/errnoent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ +/* "ARM specific syscall" personality */ #include "../errnoent.h" diff --git a/linux/arm/ioctlent1.h b/linux/arm/ioctlent1.h index 1f92feb7..b0f8d87c 100644 --- a/linux/arm/ioctlent1.h +++ b/linux/arm/ioctlent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ -#include "linux/ioctlent.h" +/* "ARM specific syscall" personality */ +#include "../ioctlent.h" diff --git a/linux/arm/signalent1.h b/linux/arm/signalent1.h index 5c18d98b..c927d729 100644 --- a/linux/arm/signalent1.h +++ b/linux/arm/signalent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ +/* i386 personality */ #include "../signalent.h" diff --git a/linux/arm/syscallent1.h b/linux/arm/syscallent1.h index ac8b44ac..a2ac61d5 100644 --- a/linux/arm/syscallent1.h +++ b/linux/arm/syscallent1.h @@ -1,4 +1,4 @@ -/* ARM specific syscalls */ +/* "ARM specific syscall" personality */ { 5, 0, NULL, NULL }, /* 0 */ { 5, 0, printargs, "breakpoint" }, /* 1 */ { 5, 0, printargs, "cacheflush" }, /* 2 */ diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h index 6e74968d..eb12f43a 100644 --- a/linux/ia64/syscallent.h +++ b/linux/ia64/syscallent.h @@ -126,7 +126,7 @@ #define sys_fstat64 printargs #define sys_fcntl64 printargs -#include "i386/syscallent.h" +#include "../i386/syscallent.h" #undef sys_getrlimit #undef sys_afs_syscall diff --git a/linux/powerpc/ioctlent1.h b/linux/powerpc/ioctlent1.h index 18d31b54..df485d30 100644 --- a/linux/powerpc/ioctlent1.h +++ b/linux/powerpc/ioctlent1.h @@ -1 +1 @@ -#include "linux/ioctlent.h" +#include "../ioctlent.h" diff --git a/linux/tile/errnoent1.h b/linux/tile/errnoent1.h index 4e7d7f54..439ec5c2 100644 --- a/linux/tile/errnoent1.h +++ b/linux/tile/errnoent1.h @@ -1,2 +1,2 @@ /* tilegx32/tilepro */ -#include "linux/errnoent.h" +#include "../errnoent.h" diff --git a/linux/tile/ioctlent1.h b/linux/tile/ioctlent1.h index b9cfa958..4e7eb8d5 100644 --- a/linux/tile/ioctlent1.h +++ b/linux/tile/ioctlent1.h @@ -1,2 +1,2 @@ /* tilegx32/tilepro */ -#include "linux/ioctlent.h" +#include "../ioctlent.h" diff --git a/linux/tile/signalent1.h b/linux/tile/signalent1.h index 72438de9..27a3e481 100644 --- a/linux/tile/signalent1.h +++ b/linux/tile/signalent1.h @@ -1,2 +1,2 @@ /* tilegx32/tilepro */ -#include "linux/signalent.h" +#include "../signalent.h" diff --git a/linux/x32/errnoent1.h b/linux/x32/errnoent1.h index a8948276..de1136cd 100644 --- a/linux/x32/errnoent1.h +++ b/linux/x32/errnoent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ +/* i386 personality */ #include "../errnoent.h" diff --git a/linux/x32/ioctlent1.h b/linux/x32/ioctlent1.h index 1f92feb7..85b8ccad 100644 --- a/linux/x32/ioctlent1.h +++ b/linux/x32/ioctlent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ -#include "linux/ioctlent.h" +/* i386 personality */ +#include "../ioctlent.h" diff --git a/linux/x32/signalent1.h b/linux/x32/signalent1.h index 5c18d98b..c927d729 100644 --- a/linux/x32/signalent1.h +++ b/linux/x32/signalent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ +/* i386 personality */ #include "../signalent.h" diff --git a/linux/x32/syscallent1.h b/linux/x32/syscallent1.h index e58372ee..5f6394e7 100644 --- a/linux/x32/syscallent1.h +++ b/linux/x32/syscallent1.h @@ -7,4 +7,4 @@ #define sys_lstat64 sys_stat64 #define sys_truncate64 sys_truncate #define sys_ftruncate64 sys_ftruncate -#include "i386/syscallent.h" +#include "../i386/syscallent.h" diff --git a/linux/x86_64/errnoent1.h b/linux/x86_64/errnoent1.h index a8948276..de1136cd 100644 --- a/linux/x86_64/errnoent1.h +++ b/linux/x86_64/errnoent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ +/* i386 personality */ #include "../errnoent.h" diff --git a/linux/x86_64/errnoent2.h b/linux/x86_64/errnoent2.h index 00de57b6..0630919d 100644 --- a/linux/x86_64/errnoent2.h +++ b/linux/x86_64/errnoent2.h @@ -1,2 +1,2 @@ -/* Our third set is for x32. */ +/* x32 personality */ #include "../errnoent.h" diff --git a/linux/x86_64/ioctlent1.h b/linux/x86_64/ioctlent1.h index 1f92feb7..85b8ccad 100644 --- a/linux/x86_64/ioctlent1.h +++ b/linux/x86_64/ioctlent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ -#include "linux/ioctlent.h" +/* i386 personality */ +#include "../ioctlent.h" diff --git a/linux/x86_64/ioctlent2.h b/linux/x86_64/ioctlent2.h index 060003b3..da668a81 100644 --- a/linux/x86_64/ioctlent2.h +++ b/linux/x86_64/ioctlent2.h @@ -1,2 +1,2 @@ -/* Our third set is for x32. */ -#include "linux/ioctlent.h" +/* x32 personality */ +#include "../ioctlent.h" diff --git a/linux/x86_64/signalent1.h b/linux/x86_64/signalent1.h index 5c18d98b..c927d729 100644 --- a/linux/x86_64/signalent1.h +++ b/linux/x86_64/signalent1.h @@ -1,2 +1,2 @@ -/* Our second set comes from the i386 files. */ +/* i386 personality */ #include "../signalent.h" diff --git a/linux/x86_64/signalent2.h b/linux/x86_64/signalent2.h index 6fbcab12..c8f6824f 100644 --- a/linux/x86_64/signalent2.h +++ b/linux/x86_64/signalent2.h @@ -1,2 +1,2 @@ -/* Our third set is for x32. */ +/* x32 personality */ #include "../signalent.h" diff --git a/linux/x86_64/syscallent1.h b/linux/x86_64/syscallent1.h index 90977851..98ffe76f 100644 --- a/linux/x86_64/syscallent1.h +++ b/linux/x86_64/syscallent1.h @@ -4,4 +4,4 @@ #define sys_oldstat printargs #define sys_oldfstat printargs #define sys_oldlstat printargs -#include "i386/syscallent.h" +#include "../i386/syscallent.h" diff --git a/linux/x86_64/syscallent2.h b/linux/x86_64/syscallent2.h index 1d35f536..5e0df532 100644 --- a/linux/x86_64/syscallent2.h +++ b/linux/x86_64/syscallent2.h @@ -1,2 +1,2 @@ -/* Our third set is for x32. */ -#include "x32/syscallent.h" +/* x32 personality */ +#include "../x32/syscallent.h"