From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 855F2C606C1 for ; Mon, 8 Jul 2019 15:49:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EC9D21743 for ; Mon, 8 Jul 2019 15:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562600957; bh=GOB/YXIpeKG8WTf2PwyMQg9WJC6fmWNCpDL1MuwziA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oZiW9s2QzOQ88Pc41Yol2S0bPHxh1iMZjheUKrB6go1T0/xCzxtvVRfjeIsnKLXwE zxL8IeG2cMURopsiO6pOZMOA5gD/yKctH7zevs0R9AdoqQKGSRNmBfy9d9O+PFgtrZ TUZ6G/ouK3ZAsiJwGSS7v2vrVwoQfdj8T7qX7rzQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732674AbfGHPQw (ORCPT ); Mon, 8 Jul 2019 11:16:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:40018 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732668AbfGHPQw (ORCPT ); Mon, 8 Jul 2019 11:16:52 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1514221537; Mon, 8 Jul 2019 15:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599011; bh=GOB/YXIpeKG8WTf2PwyMQg9WJC6fmWNCpDL1MuwziA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MADOcEbl3LjpWZe53jh9X7ZiaI6611shBhwzNHrz8cd4+s3WJOegnZnMfBAu21OLw mXqP+gV2ImjrM3S19iiJIqloEoSpJHZPTPmoohLm3JaS4l1hQ93i+GeJybVZlvKdnx EvKbRRUzSS2lxttV3T4V92e2VIuEI79dbgb+VYyY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" , Richard Weinberger , Alessio Balsini Subject: [PATCH 4.4 48/73] um: Compile with modern headers Date: Mon, 8 Jul 2019 17:12:58 +0200 Message-Id: <20190708150523.917326177@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150513.136580595@linuxfoundation.org> References: <20190708150513.136580595@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason A. Donenfeld commit 530ba6c7cb3c22435a4d26de47037bb6f86a5329 upstream. Recent libcs have gotten a bit more strict, so we actually need to include the right headers and use the right types. This enables UML to compile again. Signed-off-by: Jason A. Donenfeld Cc: stable@vger.kernel.org Signed-off-by: Richard Weinberger Signed-off-by: Alessio Balsini Signed-off-by: Greg Kroah-Hartman --- arch/um/os-Linux/file.c | 1 + arch/um/os-Linux/signal.c | 2 ++ arch/x86/um/stub_segv.c | 1 + 3 files changed, 4 insertions(+) --- a/arch/um/os-Linux/file.c +++ b/arch/um/os-Linux/file.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c @@ -14,7 +14,9 @@ #include #include #include +#include #include +#include void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = { [SIGTRAP] = relay_signal, --- a/arch/x86/um/stub_segv.c +++ b/arch/x86/um/stub_segv.c @@ -6,6 +6,7 @@ #include #include #include +#include void __attribute__ ((__section__ (".__syscall_stub"))) stub_segv_handler(int sig, siginfo_t *info, void *p)