summaryrefslogtreecommitdiff
path: root/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2015-11-18 16:22:39 +0100
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2015-11-18 16:22:39 +0100
commit3f1c9e7b4ba7cefa263a3af0156881f53f60ef09 (patch)
tree199e07093f51f7d53dfb45cf0e63e1b7c23e78f7 /patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
parent213397b608b539ee53fd3a8baddb5120e04054d5 (diff)
downloadlinux-rt-3f1c9e7b4ba7cefa263a3af0156881f53f60ef09.tar.gz
[ANNOUNCE] 4.1.13-rt14v4.1.13-rt14-patches
Dear RT folks! I'm pleased to announce the v4.1.13-rt14 patch set. Changes since v4.1.12-rt13: none. Known issues: You can get this release via the git tree at: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt-rebase git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt-queue The RT patch against 4.1.3 can be found here: https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.1/patch-4.1.13-rt14.patch.xz The split quilt queue is available at: https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.1/patches-4.1.13-rt14.tar.xz Sebastian Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch')
-rw-r--r--patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch b/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
index 87e71be752bc..edf10aca00f4 100644
--- a/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
+++ b/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
@@ -31,10 +31,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kernel/time/hrtimer.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
-Index: linux-rt-devel/kernel/time/hrtimer.c
-===================================================================
---- linux-rt-devel.orig/kernel/time/hrtimer.c
-+++ linux-rt-devel/kernel/time/hrtimer.c
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
@@ -1746,12 +1746,13 @@ void hrtimer_init_sleeper(struct hrtimer
}
EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
@@ -61,7 +59,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c
goto out;
rmtp = restart->nanosleep.rmtp;
-@@ -1812,8 +1814,10 @@ out:
+@@ -1812,8 +1814,10 @@ long __sched hrtimer_nanosleep_restart(s
return ret;
}
@@ -83,7 +81,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c
goto out;
/* Absolute timers do not update the rmtp value and restart: */
-@@ -1853,6 +1857,12 @@ out:
+@@ -1853,6 +1857,12 @@ long hrtimer_nanosleep(struct timespec *
return ret;
}