From 5e3aaadf1d5335635ce0f9c132ab2093d46e65bf Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 16 Jun 2014 02:31:23 +0000 Subject: [PATCH] [rt] hrtimer: Disable MISSED_TIMER_OFFSETS_HIST as it will currently result in a panic svn path=/dists/sid/linux/; revision=21450 --- debian/changelog | 2 ++ debian/config/featureset-rt/config | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 87dbea740..bdbdd977d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -231,6 +231,8 @@ linux (3.14.7-1) UNRELEASED; urgency=medium (CVE-2014-4014) * SCSI: Fix spurious request sense in error handling (regression in 3.14) * PCI/MSI: Fix memory leak in free_msi_irqs() (regression in 3.14) + * [rt] hrtimer: Disable MISSED_TIMER_OFFSETS_HIST as it will currently + result in a panic -- Ian Campbell Fri, 06 Jun 2014 18:18:41 +0100 diff --git a/debian/config/featureset-rt/config b/debian/config/featureset-rt/config index 247fe31b6..1610bdc49 100644 --- a/debian/config/featureset-rt/config +++ b/debian/config/featureset-rt/config @@ -1,7 +1,10 @@ # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT_RT_FULL=y CONFIG_SCHED_TRACER=y -CONFIG_MISSED_TIMER_OFFSETS_HIST=y +#. This option is broken after commit 84ea7fe37908 +#. ('hrtimer: Set expiry time before switch_hrtimer_base()') but should be +#. enabled when this is resolved +# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set CONFIG_WAKEUP_LATENCY_HIST=y ## disable aufs as it's not needed on rt and conflicts with fs-dentry-use-seqlock.patch