From patchwork Wed Apr 25 16:03:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 904477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91847-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="o9Coc0dt"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40WQ602HMDz9s0t for ; Thu, 26 Apr 2018 02:05:44 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=s91tstmTAOi8y+wp/I+cXZ5AVpUBC9a WUfliG5EdXfgX3pD+mHFh9PESeopzRoWpZPcUIL+ij1qlwfOIpblvfwoS7x3Cscj BSB+Ma/krkiAsraHzhgCZWVj8kuzLIDxOQ40AFwIkDde7V9UHdIeYN/c11lGkaK+ lPNgddEdQjRM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=oAvsTNF+9XWtLbd2p8vPn2mHhWM=; b=o9Coc 0dtkPHTo/Nrkd+OpGbojVnGyhM7+0E7v3VZHh3XUS5lICE4IDjW69wHbpbLOdGu1 M4agicCZtNrBcXEQ8MeW62A63sIAzNlADd9v9cpqOr/Vl+lJv/Zak/UaNM2lUXwX KKMGmFPdkpdyy+BuQWe5Pr8tGf7YPjD8t2efoQ= Received: (qmail 60975 invoked by alias); 25 Apr 2018 16:05:03 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 60858 invoked by uid 89); 25 Apr 2018 16:05:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: mout.kundenserver.de From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org, tglx@linutronix.de, netdev@vger.kernel.org, deepa.kernel@gmail.com, viro@zeniv.linux.org.uk, albert.aribaud@3adev.fr, Peter Zijlstra , Darren Hart , "Eric W. Biederman" , Dominik Brodowski Subject: [PATCH 11/17] y2038: Prepare sched_rr_get_interval for __kernel_timespec Date: Wed, 25 Apr 2018 18:03:05 +0200 Message-Id: <20180425160311.2718314-12-arnd@arndb.de> In-Reply-To: <20180425160311.2718314-1-arnd@arndb.de> References: <20180425160311.2718314-1-arnd@arndb.de> X-UI-Out-Filterresults: notjunk:1; V01:K0:/FaaNQSDfXA=:9RI72P3/fCSIoEz5AehtOp Z0NMYXhTYhud0oBUDxmHd9qNcll4mgXzU48abDtcCQG19gl1v9ecytnu8ODKPuGt4AiGh8TPw s6LrO/81e57P0qTMNRPJxWUWA5Cbe7gPFLRtURoMU+xYria8cwhJN/imNhrl7qfTEER/kBqXl b3OuFRDxgdFaaok/4/IVQ8GiAIdaNGXsdQ2dJqxLuwtlbIr0hW2DpZNbjccwhyJH0BXGkT/yf ZH8dxheDMcN9KQpzZB8XAp083yKyJ8O3OT2O916M+pQTwgZhoBm+hQXRxGbNs0K5G8XnyDCm7 2isfPv9r2Q+jAbS2udojw46o2gc/ZOTEJaSZ1a0OmPkkM+Vp4a0weTkUhCd+0ohtQwhkOunE2 +iFhVYTxw7fzgVRp0MJcMfa2WoHRc2ebZ0hBg3lqJKIGWaBVcK3emr7yxMMUEsAA3PmY9Mp4r z5iP5BRJipbMlBjsb2J4Y2jhcY50C82fn7mOQHkzc+rREZVjJusf490JMvRJHYl0D7B7+lNGH Bp893+YyJbP3R4CngVkrR6gqLoFN3Xc3Ebr7BuPxpv0v7y+zanIcKS9UXoLqAJ59zdx+pZowH bmhxoZy69Y9WTYhaKtfytomJrOlkDFX+7FWRITNsqhkQvGlmtATdkzvROXZMRAFnsn+2QRv7Z GrUmTZ1JB3B5kXSM2EMStBP+8JJpk8vlEBBf3A+sYUulO1rxBb2ObdDNefFunkL5ahYA= This is a preparation patch for converting sys_sched_rr_get_interval to work with 64-bit time_t on 32-bit architectures. The 'interval' argument is changed to struct __kernel_timespec, which will be redefined using 64-bit time_t in the future. The compat version of the system call in turn is enabled for compilation with CONFIG_COMPAT_32BIT_TIME so the individual 32-bit architectures can share the handling of the traditional argument with 64-bit architectures providing it for their compat mode. Signed-off-by: Arnd Bergmann --- include/linux/syscalls.h | 2 +- kernel/sched/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index c3d504dbba9c..2619678359ee 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -601,7 +601,7 @@ asmlinkage long sys_sched_yield(void); asmlinkage long sys_sched_get_priority_max(int policy); asmlinkage long sys_sched_get_priority_min(int policy); asmlinkage long sys_sched_rr_get_interval(pid_t pid, - struct timespec __user *interval); + struct __kernel_timespec __user *interval); /* kernel/signal.c */ asmlinkage long sys_restart_syscall(void); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 5e10aaeebfcc..1e0afc42975b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5272,7 +5272,7 @@ static int sched_rr_get_interval(pid_t pid, struct timespec64 *t) * an error code. */ SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid, - struct timespec __user *, interval) + struct __kernel_timespec __user *, interval) { struct timespec64 t; int retval = sched_rr_get_interval(pid, &t); @@ -5283,7 +5283,7 @@ SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid, return retval; } -#ifdef CONFIG_COMPAT +#ifdef CONFIG_COMPAT_32BIT_TIME COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval, compat_pid_t, pid, struct compat_timespec __user *, interval)