collapse out byte order conditions in bits/sem.h for fixed-endian archs

having preprocessor conditionals on byte order in the bits headers for
fixed-endian archs is confusing at best. remove them.

diff --git a/arch/i386/bits/sem.h b/arch/i386/bits/sem.h
index d383d4ea552d9a092e3960e36d1dc3f97feaecdd..e61571c121fc781d1254c33c39575025e6dcb436 100644 (file)
--- a/arch/i386/bits/sem.h
+++ b/arch/i386/bits/sem.h
@@ -4,13 +4,8 @@ struct semid_ds {
        long __unused1;
        time_t sem_ctime;
        long __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
        unsigned short sem_nsems;
        char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-#else
-       char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-       unsigned short sem_nsems;
-#endif
        long __unused3;
        long __unused4;
 };

diff --git a/arch/m68k/bits/sem.h b/arch/m68k/bits/sem.h
index d383d4ea552d9a092e3960e36d1dc3f97feaecdd..08faafead1f00dd58852b6b35f279ed2cf602afe 100644 (file)
--- a/arch/m68k/bits/sem.h
+++ b/arch/m68k/bits/sem.h
@@ -4,13 +4,8 @@ struct semid_ds {
        long __unused1;
        time_t sem_ctime;
        long __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-       unsigned short sem_nsems;
-       char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-#else
        char __sem_nsems_pad[sizeof(long)-sizeof(short)];
        unsigned short sem_nsems;
-#endif
        long __unused3;
        long __unused4;
 };

diff --git a/arch/or1k/bits/sem.h b/arch/or1k/bits/sem.h
index d383d4ea552d9a092e3960e36d1dc3f97feaecdd..08faafead1f00dd58852b6b35f279ed2cf602afe 100644 (file)
--- a/arch/or1k/bits/sem.h
+++ b/arch/or1k/bits/sem.h
@@ -4,13 +4,8 @@ struct semid_ds {
        long __unused1;
        time_t sem_ctime;
        long __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-       unsigned short sem_nsems;
-       char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-#else
        char __sem_nsems_pad[sizeof(long)-sizeof(short)];
        unsigned short sem_nsems;
-#endif
        long __unused3;
        long __unused4;
 };

diff --git a/arch/x86_64/bits/sem.h b/arch/x86_64/bits/sem.h
index d383d4ea552d9a092e3960e36d1dc3f97feaecdd..e61571c121fc781d1254c33c39575025e6dcb436 100644 (file)
--- a/arch/x86_64/bits/sem.h
+++ b/arch/x86_64/bits/sem.h
@@ -4,13 +4,8 @@ struct semid_ds {
        long __unused1;
        time_t sem_ctime;
        long __unused2;
-#if __BYTE_ORDER == __LITTLE_ENDIAN
        unsigned short sem_nsems;
        char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-#else
-       char __sem_nsems_pad[sizeof(long)-sizeof(short)];
-       unsigned short sem_nsems;
-#endif
        long __unused3;
        long __unused4;
 };