* Arnd Bergmann:
> diff --git a/include/uapi/asm-generic/posix_types.h b/include/uapi/asm-generic/posix_types.h
> index f0733a26ebfc..2a8c68ac88ca 100644
> --- a/include/uapi/asm-generic/posix_types.h
> +++ b/include/uapi/asm-generic/posix_types.h
> @@ -77,7 +77,11 @@ typedef __kernel_long_t __kernel_ptrdiff_t;
>
> #ifndef __kernel_fsid_t
> typedef struct {
> +#ifdef __KERNEL__
> int val[2];
> +#else
> + int __kernel_val[2];
> +#endif
> } __kernel_fsid_t;
> #endif
>
> diff --git a/include/uapi/linux/posix_types.h b/include/uapi/linux/posix_types.h
> index 9a7a740b35a2..a5a5cfc38bbf 100644
> --- a/include/uapi/linux/posix_types.h
> +++ b/include/uapi/linux/posix_types.h
> @@ -23,7 +23,7 @@
> #define __FD_SETSIZE 1024
>
> typedef struct {
> - unsigned long fds_bits[__FD_SETSIZE / (8 * sizeof(long))];
> + unsigned long __kernel_fds_bits[__FD_SETSIZE / (8 * sizeof(long))];
> } __kernel_fd_set;
>
> /* Type of a signal handler. */
Both changes look reasonably to me, but I have not tested them.
