From patchwork Thu Jan 2 22:23:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22872 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBA11202E2 for ; Thu, 2 Jan 2014 22:23:47 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id w5sf17954435vbf.5 for ; Thu, 02 Jan 2014 14:23:47 -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=9F1zX3R0Tl+y5krY3X5QkQ6Bm5jE+WZ2Zh/bFbKBp7I=; b=ZVH1LOZ19MhdfwmS/lMu7m8zvQR6zpgCPZf0SXJ6Wa1Nf01tv5Sod9MNCu/RWiuwNu RUE5h5ixEQg1JgFyeVY6Mpu5/bbgIEBgFkCUEwxkXhSmGr9m/k2+79T29CVupezI/dtg usbtRSw+JU81ek4VrwFlFByp4ON47A4k5lIa/3pYmD76LBQdRBRUFa2x7w3vScUalnQR bOt7nKDXGP36R6dYWweSjBJW1uYmYhwqTGsVWK1MIp1hMTeuV6WhvT5lPMSN4vG/9h0W 84n5+U15LR0N1IOGy8ogP7EIU3JdouuwaqByz09XfAF41QBL1dqUPC4tQG5eM4Gk5N4+ jE6Q== X-Gm-Message-State: ALoCoQmHHjgavl0/zSTW4QKXAsAcSHVQeO8utwEBF1BhaBb6eRN5FJO1aRYuvue+YHgQmZ9/XoOE X-Received: by 10.58.238.199 with SMTP id vm7mr32585847vec.17.1388701427147; Thu, 02 Jan 2014 14:23:47 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.48.105 with SMTP id k9ls4393502qen.96.gmail; Thu, 02 Jan 2014 14:23:47 -0800 (PST) X-Received: by 10.58.233.98 with SMTP id tv2mr49042376vec.11.1388701427054; Thu, 02 Jan 2014 14:23:47 -0800 (PST) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id gx6si23708389vdc.141.2014.01.02.14.23.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Jan 2014 14:23:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.50; Received: by mail-vb0-f50.google.com with SMTP id w18so7309667vbj.23 for ; Thu, 02 Jan 2014 14:23:47 -0800 (PST) X-Received: by 10.58.69.41 with SMTP id b9mr13439766veu.5.1388701426981; Thu, 02 Jan 2014 14:23:46 -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.59.13.131 with SMTP id ey3csp795766ved; Thu, 2 Jan 2014 14:23:46 -0800 (PST) X-Received: by 10.68.198.68 with SMTP id ja4mr90924047pbc.24.1388701425836; Thu, 02 Jan 2014 14:23:45 -0800 (PST) Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com [209.85.220.51]) by mx.google.com with ESMTPS id e8si43762056pac.169.2014.01.02.14.23.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Jan 2014 14:23:45 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.51 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.51; Received: by mail-pa0-f51.google.com with SMTP id fa1so14955682pad.24 for ; Thu, 02 Jan 2014 14:23:45 -0800 (PST) X-Received: by 10.66.188.203 with SMTP id gc11mr90185596pac.63.1388701425244; Thu, 02 Jan 2014 14:23:45 -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 ju10sm104179969pbd.33.2014.01.02.14.23.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Jan 2014 14:23:44 -0800 (PST) From: John Stultz To: LKML Cc: John Stultz Subject: [PATCH 9/9] timekeeping: Remove comment that's mostly out of date Date: Thu, 2 Jan 2014 14:23:27 -0800 Message-Id: <1388701407-5029-9-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1388701407-5029-1-git-send-email-john.stultz@linaro.org> References: <52C5E6A0.7010507@linaro.org> <1388701407-5029-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=neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Prior to 92bb1fcf57a0c2e45f7e67fbf0a8ed475a749236 (Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems), the comment here was accuate, but now we can mostly avoid the extra rounding which causes the unlikey to be actually likely here. So remove the out of date comment. Signed-off-by: John Stultz --- kernel/time/timekeeping.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 3ff3064..abfa4e8 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1134,16 +1134,6 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset) * we can adjust by 1. */ error >>= 2; - /* - * XXX - In update_wall_time, we round up to the next - * nanosecond, and store the amount rounded up into - * the error. This causes the likely below to be unlikely. - * - * The proper fix is to avoid rounding up by using - * the high precision tk->xtime_nsec instead of - * xtime.tv_nsec everywhere. Fixing this will take some - * time. - */ if (likely(error <= interval)) adj = 1; else