From patchwork Tue May 26 18:54:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 225329 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, USER_AGENT_GIT 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 C1568C433E4 for ; Tue, 26 May 2020 19:16:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 94F4120776 for ; Tue, 26 May 2020 19:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520579; bh=cEyHBFC3X+SM8f+LOE2aDFSiIZ9pf7/5DTMY407Jr9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BLUntPn+LXeaLXAicAaaA0ZW/56q05MYLxud7nJhA1GKsxGKaSZ+k6L1XNbBdG0c7 YHiUIP9gLrz5bmTWiCjh2Bj53QWkiH8kpmJVuQT7D4IFPWNNqLE7tY7641LYL7UJqk zAU3yBmGfZG/L7TOIgOc5ulHax1JgxvQ9DnlDCfY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392289AbgEZTQT (ORCPT ); Tue, 26 May 2020 15:16:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:48630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392285AbgEZTQR (ORCPT ); Tue, 26 May 2020 15:16:17 -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 82E9E2053B; Tue, 26 May 2020 19:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520577; bh=cEyHBFC3X+SM8f+LOE2aDFSiIZ9pf7/5DTMY407Jr9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SWJFRRwKoszdZ5Ew7l3CTmkYCFbt1cO8001BT3ofQfEP/LpKbgvOvRFfjKw+bATbX v/F2ulhRsrzyZHcKRWHLoUfdqGlqZMk/0/gUYgbBdPN4ARZQf+mztYZIXYeHSsJ9jU uUdyXtbXW7yG1NoLmEn7Vp3CiYiKLGDa2Rw+t+aU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Paul Adrian Glaubitz , Arnd Bergmann , Andrew Morton , Yoshinori Sato , Rich Felker , "David S. Miller" , Linus Torvalds Subject: [PATCH 5.6 110/126] sh: include linux/time_types.h for sockios Date: Tue, 26 May 2020 20:54:07 +0200 Message-Id: <20200526183946.817686379@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183937.471379031@linuxfoundation.org> References: <20200526183937.471379031@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit fc94cf2092c7c1267fa2deb8388d624f50eba808 upstream. Using the socket ioctls on arch/sh (and only there) causes build time problems when __kernel_old_timeval/__kernel_old_timespec are not already visible to the compiler. Add an explict include line for the header that defines these structures. Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers") Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps") Reported-by: John Paul Adrian Glaubitz Signed-off-by: Arnd Bergmann Signed-off-by: Andrew Morton Tested-by: John Paul Adrian Glaubitz Cc: Yoshinori Sato Cc: Rich Felker Cc: "David S. Miller" Cc: John Paul Adrian Glaubitz Cc: Link: http://lkml.kernel.org/r/20200519131327.1836482-1-arnd@arndb.de Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/sh/include/uapi/asm/sockios.h | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/sh/include/uapi/asm/sockios.h +++ b/arch/sh/include/uapi/asm/sockios.h @@ -2,6 +2,8 @@ #ifndef __ASM_SH_SOCKIOS_H #define __ASM_SH_SOCKIOS_H +#include + /* Socket-level I/O control calls. */ #define FIOGETOWN _IOR('f', 123, int) #define FIOSETOWN _IOW('f', 124, int)