From patchwork Wed Jul 3 09:46:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alessio Balsini X-Patchwork-Id: 168401 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp651240ilk; Wed, 3 Jul 2019 02:47:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4mHagJAgxlBK6b68YwClrxTMeq5RjsYHBwy3FLIl6/K4fY5Cpbh/7PoJVCSrKSj3Qq0DV X-Received: by 2002:a63:e24c:: with SMTP id y12mr33453913pgj.81.1562147220919; Wed, 03 Jul 2019 02:47:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562147220; cv=none; d=google.com; s=arc-20160816; b=mI/GU1uk6SSS6e9eTJIrgyo8zButZP8zUjINW4M8f12/uWvRXzMHDrXpNYUafxyCQK HHkQeDkVXahrJo5A7QyznjcS3PEnrwtKql/ykfQrsAP9mOrJvtqTj0cPHlRShDAmsIbi v0m+QT65U5yWsaKP9AglDbJFWCK06h5/dEEhz89VYo9J9asfbJW1qtToZhTO4koq6ltt rRWQH9kmrMRMgUeCmeKHUcwA90+ke0WDPXwFeoA/l6p+DR13gILndLKd41iTj/h/VffG RkyqGfWGfwb5FOjauzV6S0iiCfR82m69C5rCqC0clHcj5pWGHSXpLWPgHeYnbVWVnftH ASqw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=GQbS3A8xiMmpNNf6PGola8QmLy/1LRvhN5dwsk9vSMU=; b=spta48wbgb9F3z450umfWQODwFq/vaB7aq0+tUPUFlTV/tRxxbjVvEjvVKoOb/voeH 9S7RPlxvXghxZVc6W38s4umimfZe3wg2zgjbi5GtnsXxzJTielykZREsGinqRaTvRxuV 7gprZFHJ4/PN3X8alkqrISLaMmC8c3v6LTUmzBIhTdGIo07RX6MZzGj+tYwf/bx5Sy0D asGzKSPb/r8KSXNXHfrI6TRCOUr/K21E0uB7M5ltOIudzDFtzp5aHeDYwWLEtfJSQbCy q6XNrzwRAYRxFnj8UOQvnjBA80tDbwMLDUULpn6u4bFQUGQqeozeB6t1ACNKMk+NoX8q 5w/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@android.com header.s=20161025 header.b=QiYd9+Qz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=android.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c22si1839200plz.148.2019.07.03.02.47.00; Wed, 03 Jul 2019 02:47:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@android.com header.s=20161025 header.b=QiYd9+Qz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=android.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726605AbfGCJrA (ORCPT + 14 others); Wed, 3 Jul 2019 05:47:00 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35807 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726457AbfGCJrA (ORCPT ); Wed, 3 Jul 2019 05:47:00 -0400 Received: by mail-wr1-f68.google.com with SMTP id c27so2026993wrb.2 for ; Wed, 03 Jul 2019 02:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GQbS3A8xiMmpNNf6PGola8QmLy/1LRvhN5dwsk9vSMU=; b=QiYd9+QzOW/pYTkr8SYV6I8DIASwtVXe+x5Wqr2AeqaT83gaJe7zqCocyRCqfU7rU8 HL8gpAs0Wg8VxD2DWix7nIhwdD7usU3WnfC8+2SV+Eq8/iF1NK0j8CF+mdOlFq/xDSpk T5FzMdh9pLFOnTjE9/W0L+z+lsg9wvH4gH1pRrWrude8Q8LZ3juVlvtGAZeo+814DjPd 0OfsvUHPjrFb3HvZtep8OVYp7hET1slBcptzPlMxsRbWRXphPWznHKNbz6bGOF/S5O30 GnjOGRJhMBJcvKNgLeJCyxFmJh4aNdhZL/zixn02TehjX0IdXHi2yVIF5gfWSUZTh6Vo HfcQ== 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=GQbS3A8xiMmpNNf6PGola8QmLy/1LRvhN5dwsk9vSMU=; b=GoLg1HGpMT2y1iko9R7w4pEVQ8DI/aVjYPtmijLZyKSDAS3IZsOzqs3smJV26E5hER WmsNoA854MUW/TiiOhsaR9C0R8CxGIXqWbG+hKYyft72wPceWqQ2mNed0AZPUl1K4d/T qvuR/tOxs8t8uRU1DCJKtRNiDBmg1uYyyuBK1MljnkJquRt7BD4IxsAxQ94NXAsFDfnX mzzF5y8XtSTbcHPXnxzPoehxymcnUUz7CD+8KqdS3IYLyz5r+mW1nRwdQYdKnfxZf7rP 210KjHeQuqqY7MBeroxR8i8dYoWLdsX5OQ9YxJa01nswfgUYeR4NM1fWU1gonALwWcud ptPQ== X-Gm-Message-State: APjAAAWNgKNIRmf+AciAWXCPyTCB8zJY53rihYYTub7Nlb/FUK7yRYQ8 JfkZedTzGOEU8PfHsX5bwlnckA== X-Received: by 2002:adf:ce8f:: with SMTP id r15mr28166092wrn.122.1562147217911; Wed, 03 Jul 2019 02:46:57 -0700 (PDT) Received: from balsini.lon.corp.google.com ([2a00:79e0:d:203:fc05:dec:5003:37b1]) by smtp.gmail.com with ESMTPSA id 17sm1836529wmx.47.2019.07.03.02.46.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 03 Jul 2019 02:46:57 -0700 (PDT) From: Alessio Balsini To: gregkh@linuxfoundation.org Cc: astrachan@google.com, maennich@google.com, kernel-team@android.com, stable@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4.4] um: Compile with modern headers Date: Wed, 3 Jul 2019 10:46:27 +0100 Message-Id: <20190703094627.50424-1-balsini@android.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog MIME-Version: 1.0 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 --- 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(+) -- 2.22.0.410.gd8fdbe21b5-goog diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c index 26e0164895e4..6e6f6d28d54b 100644 --- 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 diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 56648f4f8b41..5da50451d372 100644 --- 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, diff --git a/arch/x86/um/stub_segv.c b/arch/x86/um/stub_segv.c index fd6825537b97..27361cbb7ca9 100644 --- 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)