From: Florian Weimer <fw@deneb.enyo.de>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-api@vger.kernel.org, linux-arch@vger.kernel.org,
netdev@vger.kernel.org, Laura Abbott <labbott@redhat.com>,
Paul Burton <pburton@wavecomp.com>,
Deepa Dinamani <deepa.kernel@gmail.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] uapi: avoid namespace conflict in linux/posix_types.h
Date: Tue, 19 Mar 2019 22:55:20 +0100 [thread overview]
Message-ID: <87bm26il6f.fsf@mid.deneb.enyo.de> (raw)
In-Reply-To: <20190319165123.3967889-1-arnd@arndb.de> (Arnd Bergmann's message of "Tue, 19 Mar 2019 17:51:09 +0100")
* 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.
next prev parent reply other threads:[~2019-03-19 21:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 16:51 [PATCH] uapi: avoid namespace conflict in linux/posix_types.h Arnd Bergmann
2019-03-19 21:46 ` David Miller
2019-03-19 21:55 ` Florian Weimer [this message]
2019-05-07 22:50 ` Joseph Myers
2019-06-07 4:28 ` Florian Weimer
2019-06-07 18:27 ` Linus Torvalds
2019-06-07 18:43 ` Florian Weimer
2019-06-07 18:56 ` Linus Torvalds
2019-06-17 11:45 ` Florian Weimer
2019-06-17 17:49 ` Linus Torvalds
2019-06-17 18:02 ` Florian Weimer
2019-06-17 18:13 ` Linus Torvalds
2019-06-17 18:16 ` Linus Torvalds
2019-06-17 18:19 ` Florian Weimer
2019-06-17 18:48 ` Linus Torvalds
2019-06-18 7:44 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bm26il6f.fsf@mid.deneb.enyo.de \
--to=fw@deneb.enyo.de \
--cc=arnd@arndb.de \
--cc=deepa.kernel@gmail.com \
--cc=labbott@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pburton@wavecomp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).