From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12293 Path: news.gmane.org!.POSTED!not-for-mail From: Hauke Mehrtens Newsgroups: gmane.linux.lib.musl.general Subject: Re: kernel: suppress some more Linux uapi definitions Date: Mon, 1 Jan 2018 19:50:50 +0100 Message-ID: References: <20170804150928.27579-1-hauke@hauke-m.de> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1514832554 27413 195.159.176.226 (1 Jan 2018 18:49:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 1 Jan 2018 18:49:14 +0000 (UTC) Cc: felix.janda@posteo.de, dalias@libc.org To: musl@lists.openwall.com Original-X-From: musl-return-12309-gllmg-musl=m.gmane.org@lists.openwall.com Mon Jan 01 19:49:10 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1eW590-0006fg-SU for gllmg-musl@m.gmane.org; Mon, 01 Jan 2018 19:49:06 +0100 Original-Received: (qmail 1856 invoked by uid 550); 1 Jan 2018 18:51:07 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 1837 invoked from network); 1 Jan 2018 18:51:07 -0000 X-Virus-Scanned: amavisd-new at heinlein-support.de In-Reply-To: <20170804150928.27579-1-hauke@hauke-m.de> Content-Language: en-US Xref: news.gmane.org gmane.linux.lib.musl.general:12293 Archived-At: On 08/04/2017 05:09 PM, Hauke Mehrtens wrote: > The following commit activated the suppression of some uapi definitions > in musl 04983f227238 ("make netinet/in.h suppress clashing definitions > from kernel headers"), but it still misses some of the definitions for > other files. > > This will deactivate the definitions in the user space header files > exported by the Linux kernel. > > This fully works when Felix's patch posted here is applied to the Linux > kernel: > https://patchwork.kernel.org/patch/9869953/ > > Signed-off-by: Hauke Mehrtens > --- Are there any problems with this patch? The latest patch doing these changes to the kernel can be found here: https://patchwork.kernel.org/patch/10139199/ It is doing the same thing as this patch: http://git.musl-libc.org/cgit/musl/commit/?id=04983f2272382af92eb8f8838964ff944fbb8258 just for the two other effected files. Hauke > include/net/if.h | 7 +++++++ > include/sys/xattr.h | 2 ++ > 2 files changed, 9 insertions(+) > > diff --git a/include/net/if.h b/include/net/if.h > index 2f2fcc10..21f10801 100644 > --- a/include/net/if.h > +++ b/include/net/if.h > @@ -125,6 +125,13 @@ struct ifconf { > #define ifc_req ifc_ifcu.ifcu_req > #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) > > +#define __UAPI_DEF_IF_IFCONF 0 > +#define __UAPI_DEF_IF_IFMAP 0 > +#define __UAPI_DEF_IF_IFNAMSIZ 0 > +#define __UAPI_DEF_IF_IFREQ 0 > +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 > +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 > + > #endif > > #ifdef __cplusplus > diff --git a/include/sys/xattr.h b/include/sys/xattr.h > index 6479fcc6..7a0197ba 100644 > --- a/include/sys/xattr.h > +++ b/include/sys/xattr.h > @@ -24,6 +24,8 @@ int removexattr(const char *, const char *); > int lremovexattr(const char *, const char *); > int fremovexattr(int, const char *); > > +#define __UAPI_DEF_XATTR 0 > + > #ifdef __cplusplus > } > #endif >