include/asm-x86/posix_types_32.h: checkpatch cleanups - formatting only

[sfrench/cifs-2.6.git] / include / asm-x86 / posix_types_32.h

diff --git a/include/asm-x86/posix_types_32.h b/include/asm-x86/posix_types_32.h
index 133e31e7dfdeb452cd311ea73fff5c3b2603df07..b031efda37ec047417dc22b6c7b61ffd7c095b19 100644 (file)
--- a/include/asm-x86/posix_types_32.h
+++ b/include/asm-x86/posix_types_32.h
@@ -39,44 +39,47 @@ typedef long long   __kernel_loff_t;
 #endif
 
 typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
        int     val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-       int     __val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
 } __kernel_fsid_t;
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if defined(__KERNEL__)
 
 #undef __FD_SET
-#define __FD_SET(fd,fdsetp) \
-               __asm__ __volatile__("btsl %1,%0": \
-                       "+m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd)))
+#define __FD_SET(fd,fdsetp)                                    \
+       asm volatile("btsl %1,%0":                              \
+                    "+m" (*(__kernel_fd_set *)(fdsetp))        \
+                    : "r" ((int)(fd)))
 
 #undef __FD_CLR
-#define __FD_CLR(fd,fdsetp) \
-               __asm__ __volatile__("btrl %1,%0": \
-                       "+m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd)))
+#define __FD_CLR(fd,fdsetp)                                    \
+       asm volatile("btrl %1,%0":                              \
+                    "+m" (*(__kernel_fd_set *)(fdsetp))        \
+                    : "r" ((int) (fd)))
 
 #undef __FD_ISSET
-#define __FD_ISSET(fd,fdsetp) (__extension__ ({ \
-               unsigned char __result; \
-               __asm__ __volatile__("btl %1,%2 ; setb %0" \
-                       :"=q" (__result) :"r" ((int) (fd)), \
-                       "m" (*(__kernel_fd_set *) (fdsetp))); \
-               __result; }))
+#define __FD_ISSET(fd,fdsetp)                                  \
+       (__extension__                                          \
+        ({                                                     \
+        unsigned char __result;                                \
+        asm volatile("btl %1,%2 ; setb %0"                     \
+                     : "=q" (__result)                         \
+                     : "r" ((int)(fd)),                        \
+                       "m" (*(__kernel_fd_set *)(fdsetp)));    \
+        __result;                                              \
+}))
 
 #undef __FD_ZERO
-#define __FD_ZERO(fdsetp) \
-do { \
-       int __d0, __d1; \
-       __asm__ __volatile__("cld ; rep ; stosl" \
-                       :"=m" (*(__kernel_fd_set *) (fdsetp)), \
-                         "=&c" (__d0), "=&D" (__d1) \
-                       :"a" (0), "1" (__FDSET_LONGS), \
-                       "2" ((__kernel_fd_set *) (fdsetp)) : "memory"); \
+#define __FD_ZERO(fdsetp)                                      \
+do {                                                           \
+       int __d0, __d1;                                         \
+       asm volatile("cld ; rep ; stosl"                        \
+                    : "=m" (*(__kernel_fd_set *)(fdsetp)),     \
+                      "=&c" (__d0), "=&D" (__d1)               \
+                    : "a" (0), "1" (__FDSET_LONGS),            \
+                      "2" ((__kernel_fd_set *)(fdsetp))        \
+                    : "memory");                               \
 } while (0)
 
-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
+#endif /* defined(__KERNEL__) */
 
 #endif