From patchwork Tue Jan 8 20:42:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 155004 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5309858jaa; Tue, 8 Jan 2019 12:43:20 -0800 (PST) X-Google-Smtp-Source: ALg8bN6gId2s4nD7IdOKBe5RfQ6oGnwQhj9835hvefyobDMes/WgzZpdfGZ/QywBxhL97CQkRkPa X-Received: by 2002:a63:4456:: with SMTP id t22mr2948056pgk.0.1546980200872; Tue, 08 Jan 2019 12:43:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546980200; cv=none; d=google.com; s=arc-20160816; b=YddGp1MHSOyl0W6p34KlsNPDmGn+W8NichLxPkR2PCTXFlHQrecjAN4qm4Z4BcQlq4 d1d7ct81pYwhGDDPtUtwpemV4bzNbtu4eA4R/lOm1fjSukK9j3Au8XXTyOYqdE8uL8+5 4L/QDMYFsdxfDxk3m4Tgx1I7pGKPQ7ZAiXb2LgHAlIfUN91NpbbSfndVMtpfutD3Qbnx HAqyOc8Df5zZY4rELPmRDFNI3WcwiwgMtIRePamc5k3VbSmXmlY/snw+KaAMNPN1lkv+ VluMLWXT8J6XLd3278bK6AEoZsDJcPO92H0wiGZdS+W7YA4Zi9y10XJcYrcW/JN0vZTY MUsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=BEBzjPGL7RUH8NYAcPr3RP9/NxQc23r16/e7fa16qjw=; b=ZXNNQwnmtstjw97HFQR0dBN7pXsZ5mYdhnvjSP1BSxq7VlIfQ+37B1s1Sizd3csD/0 BGsxJvcMJPzRER9xyBHuQbwtx5RwBzdd7OilvXX+tZTTzZTZxXWDh7trOnZnt2X5xRng Rd5z0wA35EKdpYt3PdBepIGhvAvKHm8KC4LmGo+6+Aou2RZLYE2/hTh4543w+9UGgl2g hjgtJHchgSkyZD9NI+hUJENGwyehFL5mxgw9ets7i0LHy2rezfYnjnzyUmglf1JFViCc ZTIU2Olia8hkWdomjsRLplyO8Q401yRfjJUt6xjt6SR+lnyfBZl/dgzxFeib1FYIQx6t LpZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IBWd2kzo; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y20si63553231plr.106.2019.01.08.12.43.20; Tue, 08 Jan 2019 12:43:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IBWd2kzo; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 565B67C0A1; Tue, 8 Jan 2019 20:43:14 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by mail.openembedded.org (Postfix) with ESMTP id 2A3806BE3A for ; Tue, 8 Jan 2019 20:42:59 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id t13so2230030pgr.11 for ; Tue, 08 Jan 2019 12:43:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FWtsiIpTB7N7AUoSVZSre5vIrEAEOKwIg97RwYvKCSA=; b=IBWd2kzoTSnoQzR4qTGbP21WZ7vfJm9Ve+bIxmCzKVnHGkv0m+mhUgB1S2mbo05mBB FE2H8IrVfeIl8D07JwbmZlZyyYAu8kVCtrLNYvTtuEwjhwDdzcPlo9jn8HOl1MyeAkeN S0WcZ/7MsT733TfS4q2e8ITqUdiB/av9LjzrvJZI4KuXBCrF3YN/yWTFxQ3t1E3SjlUP wsYE7DFL47FgMwq966U4Rb41BqQy+5iDlC48UIcseEvveIurvk2zzn2hyQjYWWaxVDci D/eVOub3fdMTU5Ldz9Wv0SHqCPiORdNWVnTj1ELx17kEOt+IzAd8Cg22DXKXKVyX5uRx Hmcw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=FWtsiIpTB7N7AUoSVZSre5vIrEAEOKwIg97RwYvKCSA=; b=XfzDjRMVB7xY/ky6SMjH0VHwv6cecGmYMm7VoBBXHDkPKzV9LUmmTzVbSYSSZ+Kpsn ELXqEFojZR57Ju6LPtO+2XbUWK8YCoqDMFQOUYIN8kUPOcxvYXHcs8kDBeLWI1VAuMT5 DXnD+WCdzE0CpN50cYvjJh5teJAmx7wqTVlBSZIqxhV2GnsiUHC+YWF17WR7nNb+4/q7 Jxaz4l+ofhZcje42HuJ/p2v/0JfNHeTPjq7gJieFgXj3qgodqJfSZ9kgBIkaCvtRmT1w TzA7xetEV4dmpw1TM4vFeD07jdoNsMQVkgISnloeQXZwYlrb3arUFjKofei/9Vp91GwX /eGQ== X-Gm-Message-State: AJcUukc/2RUKIXgJQAoKeTnuOHQbGKFS+TSTs2qs+jMR1U8mRq6eNabf XgzP0IlEJfwJgAxqev9Pp+7FvQ1TSe4= X-Received: by 2002:a63:6704:: with SMTP id b4mr2887165pgc.100.1546980179707; Tue, 08 Jan 2019 12:42:59 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::6e98]) by smtp.gmail.com with ESMTPSA id t5sm109789607pfb.60.2019.01.08.12.42.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 12:42:59 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Tue, 8 Jan 2019 12:42:49 -0800 Message-Id: <20190108204249.8087-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190108204249.8087-1-raj.khem@gmail.com> References: <20190108204249.8087-1-raj.khem@gmail.com> MIME-Version: 1.0 Cc: Bruce Ashfield Subject: [OE-core] [PATCH 3/3] linux-libc-headers_4.19.bb: Backport patch to fix clockid_t in UAPI X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj Cc: Bruce Ashfield --- ...kernel_clockid_t-in-uapi-net_stamp.h.patch | 49 +++++++++++++++++++ .../linux-libc-headers_4.19.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch new file mode 100644 index 0000000000..3684cc21bf --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch @@ -0,0 +1,49 @@ +From e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5 Mon Sep 17 00:00:00 2001 +From: Davide Caratti +Date: Mon, 17 Dec 2018 11:26:38 +0100 +Subject: [PATCH] net: Use __kernel_clockid_t in uapi net_stamp.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Herton reports the following error when building a userspace program that +includes net_stamp.h: + + In file included from foo.c:2: + /usr/include/linux/net_tstamp.h:158:2: error: unknown type name + ‘clockid_t’ + clockid_t clockid; /* reference clockid */ + ^~~~~~~~~ + +Fix it by using __kernel_clockid_t in place of clockid_t. + +Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.") +Cc: Timothy Redaelli +Reported-by: Herton R. Krzesinski +Signed-off-by: Davide Caratti +Tested-by: Paolo Abeni +Signed-off-by: David S. Miller +--- +Upstream-Status: Backport [https://github.com/torvalds/linux/commit/e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5] + + include/uapi/linux/net_tstamp.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h +index 97ff3c17ec4d..e5b39721c6e4 100644 +--- a/include/uapi/linux/net_tstamp.h ++++ b/include/uapi/linux/net_tstamp.h +@@ -155,8 +155,8 @@ enum txtime_flags { + }; + + struct sock_txtime { +- clockid_t clockid; /* reference clockid */ +- __u32 flags; /* as defined by enum txtime_flags */ ++ __kernel_clockid_t clockid;/* reference clockid */ ++ __u32 flags; /* as defined by enum txtime_flags */ + }; + + #endif /* _NET_TIMESTAMPING_H */ +-- +2.20.1 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb index 8fd427efef..48f25ebc1a 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb @@ -10,6 +10,7 @@ SRC_URI_append_libc-musl = "\ " SRC_URI_append = "\ + file://0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch \ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ file://0002-arm64-sve-ptrace-Fix-SVE_PT_REGS_OFFSET-definition.patch \