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 <vda.linux@googlemail.com>

diff --git a/defs.h b/defs.h
index e33c420aaacb8b5593828fa0c0989418754383cc..8f397126889ed670878f6912f3a40fbd27709655 100644 (file)
--- 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 a894827605925cc9fce940955a4fb55b224f7c7c..2ec40614fbde54e9a412507d867a9f23aec15c9e 100644 (file)
--- 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 1f92feb74b7a00653dda6c30bd750d1c80df885a..b0f8d87c8248a752538ee26afb415e795df8e8f6 100644 (file)
--- 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 5c18d98b4088143ff53889e11f2d2807b3594704..c927d7290e6c019c4ea74592c9d57d1fb2ebf0c1 100644 (file)
--- 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 ac8b44ac9bf0fd7bc630135a02a006cff48d475c..a2ac61d593d2637d1d7e6efd08851f656d24705d 100644 (file)
--- 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 6e74968dc83b73e7b863a6c732448521697dde57..eb12f43a3f7e811f98311163737c9c91f2bc8f44 100644 (file)
--- 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 18d31b544d6aee2ee1d3829c7a04c9e149994b46..df485d3037cd94096522482086ce9c78f6e910a5 100644 (file)
--- 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 4e7d7f54b17956747fcad8afc98e51e20ec37704..439ec5c270f9e9c4250d32e8e2aaedcdf8773ebb 100644 (file)
--- 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 b9cfa9588ef7a34098594421dca0768a2062b621..4e7eb8d51a8e48edd777d329ddd66efdc7fb1153 100644 (file)
--- 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 72438de9db4142ec3b55f2e7427d5fd60c340d59..27a3e48120a320d1be822031cde9b63cfad92cbf 100644 (file)
--- 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 a894827605925cc9fce940955a4fb55b224f7c7c..de1136cd98aca766fcd5adec97be575a61ce6613 100644 (file)
--- 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 1f92feb74b7a00653dda6c30bd750d1c80df885a..85b8ccad9888200ec9175467deb5dad9b31912b8 100644 (file)
--- 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 5c18d98b4088143ff53889e11f2d2807b3594704..c927d7290e6c019c4ea74592c9d57d1fb2ebf0c1 100644 (file)
--- 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 e58372ee39f2856ed6dc199a2683a0be218716a5..5f6394e7a7b987caac80270df5f012dec8314cbc 100644 (file)
--- 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 a894827605925cc9fce940955a4fb55b224f7c7c..de1136cd98aca766fcd5adec97be575a61ce6613 100644 (file)
--- 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 00de57b6931d7bfeb112d417f6e0066cf7ba5c80..0630919d86903f0eb0e575324a7403e7dd1bfa3d 100644 (file)
--- 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 1f92feb74b7a00653dda6c30bd750d1c80df885a..85b8ccad9888200ec9175467deb5dad9b31912b8 100644 (file)
--- 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 060003b36bd8e5cf6644e1dda37da331e44b0502..da668a81bbd28b3049a0bedc42bbd207328a32d2 100644 (file)
--- 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 5c18d98b4088143ff53889e11f2d2807b3594704..c927d7290e6c019c4ea74592c9d57d1fb2ebf0c1 100644 (file)
--- 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 6fbcab12cf63a49a53b14c1b3cd64fc26150078a..c8f6824f9aa3f3281b3c90e32d8208e4a08ad5d8 100644 (file)
--- 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 909778513a3207e9b03f116c6e64daffef7f4f77..98ffe76fca35822ed24c3ab43be3163f776e01ef 100644 (file)
--- 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 1d35f536926f252bd7f329a73ec228b1ee32c979..5e0df5328b8ca8ba9ebd42492db7b0fbb5cf317d 100644 (file)
--- 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"