From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 16569 invoked from network); 30 Sep 2020 21:47:00 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 30 Sep 2020 21:47:00 -0000 Received: (qmail 17696 invoked by uid 550); 30 Sep 2020 21:46:56 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 17666 invoked from network); 30 Sep 2020 21:46:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=39+8RWVqTuiI4YbhiNQA70SbucYKvdxenXv8hFTp1HA=; b=V5CB/+LOsnfXawz2Sm4PJvs3LO5gnsrkEtbG1UZh8QrpqrOvrXVz0YIw1v+Vaa4XPF AzjR3pGi/OypMuxRr89e9CMEaaf3d9oUUDXQDU1PGfZkdpeaQuv1ZBV7f0Fk5GOyZ0rg 2TYWp/B4sJl0zJFkcLEF1RGiTnavDWkonI+DQwWYOmzQrUTHpzIWc2NkbaO9seuDgjox NBZ4oWdCahkQrCeL9vx/Pmd7LQJwA+VtuKRS2UqQlmlUpq2i2wS6/BMr0WHW/Qd+mebg 8mW7sGHOjK2l36pV2X8N5BTGQvOCPc7Tuu9ndtw3a9LRmFIb5X+XQDKoA3OhBlZWlH7b rrrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=39+8RWVqTuiI4YbhiNQA70SbucYKvdxenXv8hFTp1HA=; b=l35fGeM22JAFnjWgCCNlblBIbY3z7T6ctjEkXasrNaPIT0zuGbYrhoVT+Gd9crKm1t cm6n0Uy811xCMr5clFJ7fFL27w+At6c8Nx/RRiCez6rjCWy9i0VGSK4HP3isCsyVJCva HlB7S/ie8j78vpMWxXBeA8jgtUGucN7F4g+bxKipAEyubWbWT8zuWYp4RRhQD6R/Y1Bn QRNTIFbNXKIAkF9SPPR+xmtMBmUgkmXQVcCNSnLS3BelnVgMDYyqpN7uxkjaVs0EHoUO 7MqvcUAGs5a9oDJTqH+D9OZagfWZGijqqT0Dfb13tFSvRdE72rXHUjqWMlvu502C0UMi UfvQ== X-Gm-Message-State: AOAM531PLOQ2fGyKhTASDp4kwwXNuS7uiJ0jQztEIfeLuMev4f70CIlS IwIsU+fm5ueF3h1ez4Buop0= X-Google-Smtp-Source: ABdhPJxCevERVTVerZpNwXvM6hNFRcCcPWecPa1l2DZNLGuQX1euHwtRP8Tsyvm12RNKLsOrSkQxfg== X-Received: by 2002:a17:906:2ac5:: with SMTP id m5mr4928287eje.210.1601502404725; Wed, 30 Sep 2020 14:46:44 -0700 (PDT) From: Petr Vorel To: linux-kernel@vger.kernel.org Cc: Petr Vorel , "David S. Miller" , Michal Kubecek , musl@lists.openwall.com Date: Wed, 30 Sep 2020 23:46:36 +0200 Message-Id: <20200930214636.186132-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.27.0.rc0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH 1/1] linux/sysinfo.h: Add guarder for struct sysinfo for all but glibc libc. This fixes redefinition on MUSL which also defines struct sysinfo when including (which includes via ) and . glibc loads in . Signed-off-by: Petr Vorel --- include/uapi/linux/sysinfo.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uapi/linux/sysinfo.h b/include/uapi/linux/sysinfo.h index 435d5c23f0c0..c8ab18cd36b2 100644 --- a/include/uapi/linux/sysinfo.h +++ b/include/uapi/linux/sysinfo.h @@ -5,6 +5,8 @@ #include #define SI_LOAD_SHIFT 16 + +#if defined(__KERNEL__) || defined(__GLIBC__) struct sysinfo { __kernel_long_t uptime; /* Seconds since boot */ __kernel_ulong_t loads[3]; /* 1, 5, and 15 minute load averages */ @@ -21,5 +23,6 @@ struct sysinfo { __u32 mem_unit; /* Memory unit size in bytes */ char _f[20-2*sizeof(__kernel_ulong_t)-sizeof(__u32)]; /* Padding: libc5 uses this.. */ }; +#endif #endif /* _LINUX_SYSINFO_H */ -- 2.27.0.rc0