From patchwork Fri Nov 21 19:44:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 41364 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AEB9A25B55 for ; Fri, 21 Nov 2014 19:44:54 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id u10sf1232571lbd.10 for ; Fri, 21 Nov 2014 11:44:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Sj6m4uZ1ouiBmyeYlhsH/nNT+nTV93AN+OLiqfkcyts=; b=WHbsSyW9lW88XvTGGmHPNHolOYACIPZPlmMwmVplOMeoPoRjKQQQF3EPzBwTc1svxr Y/1FdlCbB+uH0Eh43mV12F3AejLJdGfS0T2Vk14fg+LEnDDnDS4P3lDeZHiTQzMItAMt 7qi49CSIw+wy8qmD6OXM1qe48m6kNMYksHwO/F7LQIFIsKmuUxIRdEgohXq00XlbJ6WV TiBrD1Hnoy/lz3XN/yUYfK2A0jIuWwBbzZXN9NqVzi444WuQWtDmg+gRzJJrDbvqXkzs yIQIgUoA2bVycHtSsKLuMjiwXOViNdIB6HeV3tDXCqM7YmzNegGw8MbYbKDyHZ3j/aEv hVUA== X-Gm-Message-State: ALoCoQll9g1FUTH3m4ztfFmMr3gjlJcULUfZ93ctH3zo4t6S3/2/6HSaEaOI2rc5jYUUimTBPMC9 X-Received: by 10.194.133.39 with SMTP id oz7mr2117722wjb.3.1416599093729; Fri, 21 Nov 2014 11:44:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.6 with SMTP id ci6ls249154lad.30.gmail; Fri, 21 Nov 2014 11:44:53 -0800 (PST) X-Received: by 10.152.203.137 with SMTP id kq9mr7225687lac.51.1416599093570; Fri, 21 Nov 2014 11:44:53 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id 9si7094002lak.27.2014.11.21.11.44.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 11:44:53 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id b6so4724128lbj.16 for ; Fri, 21 Nov 2014 11:44:53 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr7263707lbo.32.1416599093477; Fri, 21 Nov 2014 11:44:53 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp153763lbc; Fri, 21 Nov 2014 11:44:52 -0800 (PST) X-Received: by 10.66.192.66 with SMTP id he2mr10589999pac.68.1416599089264; Fri, 21 Nov 2014 11:44:49 -0800 (PST) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com. [209.85.220.52]) by mx.google.com with ESMTPS id bn15si10582995pac.22.2014.11.21.11.44.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 11:44:49 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.52 as permitted sender) client-ip=209.85.220.52; Received: by mail-pa0-f52.google.com with SMTP id eu11so5480766pac.25 for ; Fri, 21 Nov 2014 11:44:48 -0800 (PST) X-Received: by 10.68.241.10 with SMTP id we10mr9983267pbc.101.1416599088533; Fri, 21 Nov 2014 11:44:48 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id t9sm5513621pbs.75.2014.11.21.11.44.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Nov 2014 11:44:47 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Thomas Gleixner , Ingo Molnar , Arnd Bergmann , "pang.xunlei" , Miroslav Lichvar , Richard Cochran , Prarit Bhargava , Alessandro Zummo Subject: [PATCH 12/12] time: Remove timekeeping_inject_sleeptime() Date: Fri, 21 Nov 2014 11:44:18 -0800 Message-Id: <1416599058-13836-13-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416599058-13836-1-git-send-email-john.stultz@linaro.org> References: <1416599058-13836-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Since all users have been converted to using the 64bit timekeeping_inject_sleeptime64(), remove the old y2038 problematic timekeeping_inject_sleeptime(). Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Arnd Bergmann Cc: pang.xunlei Cc: Miroslav Lichvar Cc: Richard Cochran Cc: Prarit Bhargava Cc: Alessandro Zummo Signed-off-by: John Stultz --- include/linux/timekeeping.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 8cab4b7..961fea3 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -225,17 +225,6 @@ static inline void timekeeping_clocktai(struct timespec *ts) */ extern void timekeeping_inject_sleeptime64(struct timespec64 *delta); -/** - * Deprecated. Use timekeeping_inject_sleeptime64(). - */ -static inline void timekeeping_inject_sleeptime(struct timespec *delta) -{ - struct timespec64 delta64; - - delta64 = timespec_to_timespec64(*delta); - timekeeping_inject_sleeptime64(&delta64); -} - /* * PPS accessor */