projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into x86/memtest
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-powerpc
/
posix_types.h
diff --git
a/include/asm-powerpc/posix_types.h
b/include/asm-powerpc/posix_types.h
index 2f2288f520bed3422e7f06a99d096ab27d16a9be..c4e396b540df54289c0d5b2433ec3e93608a39d2 100644
(file)
--- a/
include/asm-powerpc/posix_types.h
+++ b/
include/asm-powerpc/posix_types.h
@@
-64,8
+64,7
@@
typedef struct {
#else /* __GNUC__ */
#else /* __GNUC__ */
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) \
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
+#if defined(__KERNEL__)
/* With GNU C, use inline functions instead so args are evaluated only once: */
#undef __FD_SET
/* With GNU C, use inline functions instead so args are evaluated only once: */
#undef __FD_SET
@@
-124,6
+123,6
@@
static __inline__ void __FD_ZERO(__kernel_fd_set *p)
}
}
}
}
-#endif /* defined(__KERNEL__)
|| !defined(__GLIBC__) || (__GLIBC__ < 2)
*/
+#endif /* defined(__KERNEL__) */
#endif /* __GNUC__ */
#endif /* _ASM_POWERPC_POSIX_TYPES_H */
#endif /* __GNUC__ */
#endif /* _ASM_POWERPC_POSIX_TYPES_H */