From patchwork Mon Jul 8 15:12:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 168662 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7295337ilk; Mon, 8 Jul 2019 08:16:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLuWa4v7RdyYRKo6kJzUCuk9OMmRE5n2+lllULqVx40iaC3twOSrAa8ugrZdJmMvJ0vBc/ X-Received: by 2002:a17:90a:c481:: with SMTP id j1mr26289186pjt.96.1562599015872; Mon, 08 Jul 2019 08:16:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562599015; cv=none; d=google.com; s=arc-20160816; b=tcR2vfQbBk/zN+XN4Kmoa3aOIwpN0yK+9ahw7JptaWW8wjDBSLv1Jl+p7bj9jv6YIN WBLw8aYnywZC894WZZ2XOFeDsTNcdXOjYEz8hjpj7/pOYOlMCGnmSeAwUO0FxSHu1Ox6 ETfS8HSeg7t/n1mTr4b3w6XMzj4xaof9ZvongJR/V8sU+zVR71Y4ntiD4uPAII+2/RPe b9c2CR/Mm1/1diyBGTV8LjcLx6PIG7rF7AkfBJ6kibV5pKhUKtI2G6liSNbRG22kMq6f +1t6zvVrU/iz1iiLoZZ6YOykf8LGhTPsaC8ZNMUBDK2Ueo1gUWMUc9qCr04VtgyXSW3h WFtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5WJ+20X6HMbYM6/ttXATlhobCOF0s/KczmSSU5UcSX0=; b=zc2Aq9eGYX/ixYk2gfSAycmnxmh/LY+IRfnl7AABCkQ8zWR9VFKSJSOR8ypHscevMN JqZutwShNjOCG6JS00YlMtxTckFtsbA7H7ZEZD0IscqDbeLGKbFKdVLP8HhBb6C9AJj2 EPlK20450N/1xyvpMVhp2YKMAR9k3IbIzrqn4Wy4CgaYOEh8Jv2A8dhTwQ9R2YEVWwms Tw3ulp7ncn2TEXr+ZHsv6345Y1orzjXkSE8pCc251wTgfvRURI35lZwTdhSOUvvLDS1m Mf0w8w+x2dYkI6MNjkfV50OLsZGUKznicXheS0Mz9dQCH0pTy5JqHWPCgiN/HtFA9cZ3 OLIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MADOcEbl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w6si19463854pfn.84.2019.07.08.08.16.55; Mon, 08 Jul 2019 08:16:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MADOcEbl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729482AbfGHPQy (ORCPT + 30 others); Mon, 8 Jul 2019 11:16:54 -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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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)