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=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 14376C433DB for ; Fri, 12 Feb 2021 12:47:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C375664E23 for ; Fri, 12 Feb 2021 12:47:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231828AbhBLMrF (ORCPT ); Fri, 12 Feb 2021 07:47:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231510AbhBLMia (ORCPT ); Fri, 12 Feb 2021 07:38:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B41FC061793; Fri, 12 Feb 2021 04:37:09 -0800 (PST) Date: Fri, 12 Feb 2021 12:37:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1613133426; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z0CYi+y57dAUEgVCA/aH8I0qXnEY+eS5dugTEQdnZfc=; b=kMg20tn03UqsyWq4lVcNK10Ebv4DiqcbR6+Epl2Ulpn3MGPFAmlqwVij6fnMjqP7QqedFA mKrpWicNPScqv9Y4MU3FwLSWBbtRXax12UYFh+h+Esmd67uHtMFpR0GDO1KxGOXFQgwxIy 0eHWy3Dl3+WMwOnFybiBGmrDxDnECJEM/JFqmzRDNf1zr436r/4rhYRp8MMq6z2cwyqgA/ CKv4lBL+/8eZ5lFCUKSjQewMIhPSugqoQ/pnoPtDGWSeLji8KpBJfQL4MmEoBHyZEdATuf 0YKif5LfHimQTJO14qf8ujnqOOyXbFlwugH3LvK3alq+cxWSCdZ8r0CmxXHe+A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1613133426; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z0CYi+y57dAUEgVCA/aH8I0qXnEY+eS5dugTEQdnZfc=; b=F+xVTpLKgPFBvML4CJjV0XlFHH+hZSBIvfLxRkcanyqi5yFI46ib2oogzJsiDClsQFl2sX 6uS3f0kujRU51ECQ== From: "tip-bot2 for Willy Tarreau" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/rcu] tools/nolibc: Get timeval, timespec and timezone from linux/time.h Cc: Valentin Schneider , Mark Rutland , Willy Tarreau , "Paul E. McKenney" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <161313342575.23325.7710961286690258494.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/rcu branch of tip: Commit-ID: 70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17 Gitweb: https://git.kernel.org/tip/70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17 Author: Willy Tarreau AuthorDate: Thu, 21 Jan 2021 08:20:28 +01:00 Committer: Paul E. McKenney CommitterDate: Thu, 21 Jan 2021 10:06:45 -08:00 tools/nolibc: Get timeval, timespec and timezone from linux/time.h The definitions of timeval(), timespec() and timezone() conflict with linux/time.h when building, so this commit takes them directly from linux/time.h. This is a port of nolibc's upstream commit dc45f5426b0c to the Linux kernel. Fixes: 66b6f755ad45 ("rcutorture: Import a copy of nolibc") Tested-by: Valentin Schneider Tested-by: Mark Rutland [arm64] Signed-off-by: Willy Tarreau Signed-off-by: Paul E. McKenney --- tools/include/nolibc/nolibc.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h index 833693f..611d9d1 100644 --- a/tools/include/nolibc/nolibc.h +++ b/tools/include/nolibc/nolibc.h @@ -94,6 +94,7 @@ #include #include #include +#include #define NOLIBC @@ -152,24 +153,6 @@ struct pollfd { short int revents; }; -/* for select() */ -struct timeval { - long tv_sec; - long tv_usec; -}; - -/* for pselect() */ -struct timespec { - long tv_sec; - long tv_nsec; -}; - -/* for gettimeofday() */ -struct timezone { - int tz_minuteswest; - int tz_dsttime; -}; - /* for getdents64() */ struct linux_dirent64 { uint64_t d_ino;