[linux] 08/11: fix fuzz in RT patchset

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch stretch
in repository linux.

commit 4a133a98921118e9a27795405beab12b96f1049f
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Thu Feb 1 21:49:30 2018 +0100

    fix fuzz in RT patchset
---
 .../features/all/rt/0124-hrtimers-Prepare-full-preemption.patch       | 4 ++--
 .../0126-hrtimer-Fixup-hrtimer-callback-changes-for-preempt-r.patch   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/features/all/rt/0124-hrtimers-Prepare-full-preemption.patch b/debian/patches/features/all/rt/0124-hrtimers-Prepare-full-preemption.patch
index a448d03..2641753 100644
--- a/debian/patches/features/all/rt/0124-hrtimers-Prepare-full-preemption.patch
+++ b/debian/patches/features/all/rt/0124-hrtimers-Prepare-full-preemption.patch
@@ -107,8 +107,8 @@ index 7bed9ce081fa..c84f04b3c394 100644
  }
  
  /*
-@@ -1633,6 +1661,9 @@ int hrtimers_prepare_cpu(unsigned int cpu)
- 
+@@ -1636,6 +1664,9 @@ int hrtimers_prepare_cpu(unsigned int cpu)
+ 	cpu_base->active_bases = 0;
  	cpu_base->cpu = cpu;
  	hrtimer_init_hres(cpu_base);
 +#ifdef CONFIG_PREEMPT_RT_BASE
diff --git a/debian/patches/features/all/rt/0126-hrtimer-Fixup-hrtimer-callback-changes-for-preempt-r.patch b/debian/patches/features/all/rt/0126-hrtimer-Fixup-hrtimer-callback-changes-for-preempt-r.patch
index 0bb44ac..a4f5283 100644
--- a/debian/patches/features/all/rt/0126-hrtimer-Fixup-hrtimer-callback-changes-for-preempt-r.patch
+++ b/debian/patches/features/all/rt/0126-hrtimer-Fixup-hrtimer-callback-changes-for-preempt-r.patch
@@ -299,7 +299,7 @@ index c84f04b3c394..0ac7cd65a163 100644
 +		INIT_LIST_HEAD(&cpu_base->clock_base[i].expired);
  	}
  
- 	cpu_base->cpu = cpu;
+ 	cpu_base->active_bases = 0;
 @@ -1733,9 +1842,26 @@ int hrtimers_dead_cpu(unsigned int scpu)
  
  #endif /* CONFIG_HOTPLUG_CPU */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git