From patchwork Mon Feb 10 21:07:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 24422 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3182720143 for ; Mon, 10 Feb 2014 21:08:00 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id i4sf30811706oah.3 for ; Mon, 10 Feb 2014 13:07:58 -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=2vv44239hC+DXcdSGb9W9Hq4l2pyYB5UnklbCj/Sq/Q=; b=jF+SBo9h6qNz3Ed5mK5ikMxRmszNTuG1BzpjTeRqtov5BBDKCOXB0ptp5qg65KECPQ JEBISyiwAe2M5cWs99DKOWL4veLVAB8tc4w6djzzsTwR4yHBSaaydT9cLyX2i69slMfM 6blQI9NVt/Z18LUDSWfw/cLz0AoaCQBM+WklqAeb0qRb148m2xaUSHpalFB85XPpf8Lr yQzgp9qxeSFIxPlEwL1S7hiTG9socDKMGwVLvE8cs4l4661A5N+m7028vBS0GHPe0jU9 d1E47Jjw36XpVKxCRjRXvn/REnyL6/zzRvWcPS6trKO3ZKbik/E697KFL/yA/gvnUcgM DZOA== X-Gm-Message-State: ALoCoQkmXzOf1MDIPPzMVO8e4gam/AzS4OgWZ4DumjnXzUi96pKI56zLbvBcc5187KAOf+c4y5PT X-Received: by 10.42.53.135 with SMTP id n7mr6804757icg.11.1392066478857; Mon, 10 Feb 2014 13:07:58 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.200 with SMTP id p66ls2239595qgp.74.gmail; Mon, 10 Feb 2014 13:07:58 -0800 (PST) X-Received: by 10.221.30.14 with SMTP id sa14mr613vcb.44.1392066478609; Mon, 10 Feb 2014 13:07:58 -0800 (PST) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id uh1si5160618vcb.25.2014.02.10.13.07.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 13:07:58 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.52 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.52; Received: by mail-vb0-f52.google.com with SMTP id p14so5126419vbm.39 for ; Mon, 10 Feb 2014 13:07:58 -0800 (PST) X-Received: by 10.52.30.230 with SMTP id v6mr21338386vdh.6.1392066478499; Mon, 10 Feb 2014 13:07:58 -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.220.174.196 with SMTP id u4csp197784vcz; Mon, 10 Feb 2014 13:07:58 -0800 (PST) X-Received: by 10.68.37.42 with SMTP id v10mr39859818pbj.127.1392066459327; Mon, 10 Feb 2014 13:07:39 -0800 (PST) Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by mx.google.com with ESMTPS id x3si16617584pbf.211.2014.02.10.13.07.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 13:07:39 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.47 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.47; Received: by mail-pa0-f47.google.com with SMTP id kp14so6692796pab.34 for ; Mon, 10 Feb 2014 13:07:38 -0800 (PST) X-Received: by 10.66.149.37 with SMTP id tx5mr27741441pab.81.1392066458108; Mon, 10 Feb 2014 13:07:38 -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 bz4sm45596387pbb.12.2014.02.10.13.07.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 13:07:37 -0800 (PST) From: John Stultz To: stable Cc: John Stultz , Thomas Gleixner , Prarit Bhargava , Richard Cochran , Ingo Molnar , Sasha Levin Subject: [PATCH 4/7] 3.13.y: timekeeping: Fix clock_set/clock_was_set think-o Date: Mon, 10 Feb 2014 13:07:21 -0800 Message-Id: <1392066444-4940-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1392066444-4940-1-git-send-email-john.stultz@linaro.org> References: <1392066444-4940-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.52 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: , In backporting 6fdda9a9c5db367130cf32df5d6618d08b89f46a (timekeeping: Avoid possible deadlock from clock_was_set_delayed), I ralized the patch had a think-o where instead of checking clock_set I accidentally typed clock_was_set (which is a function - so the conditional always is true). Upstream this was resolved in the immediately following patch 47a1b796306356f358e515149d86baf0cc6bf007 (tick/timekeeping: Call update_wall_time outside the jiffies lock). But since that patch really isn't -stable material, so this patch only pulls the name change. Cc: Thomas Gleixner Cc: Prarit Bhargava Cc: Richard Cochran Cc: Ingo Molnar Cc: Sasha Levin Cc: stable Signed-off-by: John Stultz --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 9c4f736..89bf18e 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1441,7 +1441,7 @@ static void update_wall_time(void) write_seqcount_end(&timekeeper_seq); out: raw_spin_unlock_irqrestore(&timekeeper_lock, flags); - if (clock_was_set) { + if (clock_set) { /* * XXX - I'd rather we just call clock_was_set(), but * since we're currently holding the jiffies lock, calling