Linux v3.13-3667-ge1ba845
This commit is contained in:
Josh Boyer
parent
f8e5f8cd47
commit
93a6365a2c
@ -61,7 +61,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%define rcrev 0
|
||||
# The git snapshot level
|
||||
%define gitrev 4
|
||||
%define gitrev 5
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -648,6 +648,8 @@ Patch25184: Input-ALPS-add-support-for-Dolphin-devices.patch
|
||||
|
||||
Patch25185: perf-plugin-dir.patch
|
||||
|
||||
Patch25186: peterz-printk-timestamp-fix.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
@ -1318,6 +1320,8 @@ ApplyPatch Input-ALPS-add-support-for-Dolphin-devices.patch
|
||||
|
||||
ApplyPatch perf-plugin-dir.patch
|
||||
|
||||
ApplyPatch peterz-printk-timestamp-fix.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
@ -2096,6 +2100,9 @@ fi
|
||||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Thu Jan 23 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git5.1
|
||||
- Linux v3.13-3667-ge1ba845
|
||||
|
||||
* Wed Jan 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git4.1
|
||||
- Linux v3.13-3477-gdf32e43
|
||||
|
||||
|
||||
125
peterz-printk-timestamp-fix.patch
Normal file
125
peterz-printk-timestamp-fix.patch
Normal file
@ -0,0 +1,125 @@
|
||||
|
||||
Delivered-To: jwboyer@gmail.com
|
||||
Received: by 10.76.27.197 with SMTP id v5csp306204oag;
|
||||
Wed, 22 Jan 2014 13:13:54 -0800 (PST)
|
||||
X-Received: by 10.66.4.130 with SMTP id k2mr4030960pak.95.1390425233906;
|
||||
Wed, 22 Jan 2014 13:13:53 -0800 (PST)
|
||||
Return-Path: <linux-kernel-owner@vger.kernel.org>
|
||||
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
|
||||
by mx.google.com with ESMTP id i3si11289288pbe.19.2014.01.22.13.12.44
|
||||
for <multiple recipients>;
|
||||
Wed, 22 Jan 2014 13:13:53 -0800 (PST)
|
||||
Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
|
||||
Authentication-Results: mx.google.com;
|
||||
spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org
|
||||
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||
id S1753416AbaAVVIi (ORCPT <rfc822;ksvahn@gmail.com> + 99 others);
|
||||
Wed, 22 Jan 2014 16:08:38 -0500
|
||||
Received: from merlin.infradead.org ([205.233.59.134]:42768 "EHLO
|
||||
merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||
with ESMTP id S1753275AbaAVVIh (ORCPT
|
||||
<rfc822;linux-kernel@vger.kernel.org>);
|
||||
Wed, 22 Jan 2014 16:08:37 -0500
|
||||
Received: from dhcp-077-248-225-117.chello.nl ([77.248.225.117] helo=laptop)
|
||||
by merlin.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux))
|
||||
id 1W6527-0004v6-BO; Wed, 22 Jan 2014 21:08:24 +0000
|
||||
Received: by laptop (Postfix, from userid 1000)
|
||||
id 83FEF1034BE15; Wed, 22 Jan 2014 22:08:14 +0100 (CET)
|
||||
Date: Wed, 22 Jan 2014 22:08:14 +0100
|
||||
From: Peter Zijlstra <peterz@infradead.org>
|
||||
To: Markus Trippelsdorf <markus@trippelsdorf.de>
|
||||
Cc: Sasha Levin <sasha.levin@oracle.com>,
|
||||
Arjan van de Ven <arjan@linux.intel.com>, lenb@kernel.org,
|
||||
rjw@rjwysocki.net, Eliezer Tamir <eliezer.tamir@linux.intel.com>,
|
||||
rui.zhang@intel.com, jacob.jun.pan@linux.intel.com,
|
||||
Mike Galbraith <bitbucket@online.de>,
|
||||
Ingo Molnar <mingo@kernel.org>, hpa@zytor.com,
|
||||
paulmck@linux.vnet.ibm.com, Thomas Gleixner <tglx@linutronix.de>,
|
||||
John Stultz <john.stultz@linaro.org>,
|
||||
Andy Lutomirski <luto@amacapital.net>,
|
||||
linux-kernel@vger.kernel.org, dyoung@redhat.com
|
||||
Subject: Re: [PATCH 13/15] sched: Use a static_key for sched_clock_stable
|
||||
Message-ID: <20140122210814.GC9481@laptop.programming.kicks-ass.net>
|
||||
References: <20140122120757.GL31570@twins.programming.kicks-ass.net>
|
||||
<20140122122609.GA392@x4>
|
||||
<20140122123022.GN31570@twins.programming.kicks-ass.net>
|
||||
<20140122131456.GA389@x4>
|
||||
<52DFD50E.800@oracle.com>
|
||||
<20140122183538.GA389@x4>
|
||||
<20140122184253.GN30183@twins.programming.kicks-ass.net>
|
||||
<20140122190905.GA391@x4>
|
||||
<20140122191254.GA390@x4>
|
||||
<20140122201605.GU11314@laptop.programming.kicks-ass.net>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=us-ascii
|
||||
Content-Disposition: inline
|
||||
In-Reply-To: <20140122201605.GU11314@laptop.programming.kicks-ass.net>
|
||||
User-Agent: Mutt/1.5.21 (2012-12-30)
|
||||
Sender: linux-kernel-owner@vger.kernel.org
|
||||
Precedence: bulk
|
||||
List-ID: <linux-kernel.vger.kernel.org>
|
||||
X-Mailing-List: linux-kernel@vger.kernel.org
|
||||
|
||||
>
|
||||
> I think its the right region to look through. My current suspect is the
|
||||
> linear continuity fit with the initial 'random' multiplier.
|
||||
>
|
||||
> That initial 'random' multiplier can get us quite high, and we'll fit
|
||||
> the function to match that but continue at a sane rate.
|
||||
>
|
||||
> I'll try and prod a little more later this evening as time permits.
|
||||
|
||||
Does this cure things?
|
||||
|
||||
---
|
||||
arch/x86/kernel/tsc.c | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
|
||||
index a3acbac2ee72..bb04148c5fe0 100644
|
||||
--- a/arch/x86/kernel/tsc.c
|
||||
+++ b/arch/x86/kernel/tsc.c
|
||||
@@ -237,7 +237,7 @@ static inline unsigned long long cycles_2_ns(unsigned long long cyc)
|
||||
/* XXX surely we already have this someplace in the kernel?! */
|
||||
#define DIV_ROUND(n, d) (((n) + ((d) / 2)) / (d))
|
||||
|
||||
-static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
|
||||
+static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu, bool origin)
|
||||
{
|
||||
unsigned long long tsc_now, ns_now;
|
||||
struct cyc2ns_data *data;
|
||||
@@ -252,7 +252,10 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
|
||||
data = cyc2ns_write_begin(cpu);
|
||||
|
||||
rdtscll(tsc_now);
|
||||
- ns_now = cycles_2_ns(tsc_now);
|
||||
+ if (origin)
|
||||
+ ns_now = 0;
|
||||
+ else
|
||||
+ ns_now = cycles_2_ns(tsc_now);
|
||||
|
||||
/*
|
||||
* Compute a new multiplier as per the above comment and ensure our
|
||||
@@ -926,7 +929,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
|
||||
mark_tsc_unstable("cpufreq changes");
|
||||
}
|
||||
|
||||
- set_cyc2ns_scale(tsc_khz, freq->cpu);
|
||||
+ set_cyc2ns_scale(tsc_khz, freq->cpu, false);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1199,7 +1202,7 @@ void __init tsc_init(void)
|
||||
*/
|
||||
for_each_possible_cpu(cpu) {
|
||||
cyc2ns_init(cpu);
|
||||
- set_cyc2ns_scale(cpu_khz, cpu);
|
||||
+ set_cyc2ns_scale(cpu_khz, cpu, true);
|
||||
}
|
||||
|
||||
if (tsc_disabled > 0)
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
Please read the FAQ at http://www.tux.org/lkml/
|
||||
Loading…
Reference in New Issue
Block a user