[linux] 12/29: fix context 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 7c7be52eb642088e848dd075b41f502855ba7e26
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Fri Jan 5 18:12:39 2018 +0100

    fix context in RT patchset
---
 .../features/all/rt/0050-timekeeping-Split-jiffies-seqlock.patch        | 2 +-
 .../all/rt/0248-irqwork-push-most-work-into-softirq-context.patch       | 2 +-
 .../all/rt/0249-irqwork-Move-irq-safe-work-to-irq-context.patch         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/features/all/rt/0050-timekeeping-Split-jiffies-seqlock.patch b/debian/patches/features/all/rt/0050-timekeeping-Split-jiffies-seqlock.patch
index fd02af3..560bd29 100644
--- a/debian/patches/features/all/rt/0050-timekeeping-Split-jiffies-seqlock.patch
+++ b/debian/patches/features/all/rt/0050-timekeeping-Split-jiffies-seqlock.patch
@@ -133,7 +133,7 @@ index 3bcb61b52f6c..10cb224cb9d4 100644
 +	} while (read_seqcount_retry(&jiffies_seq, seq));
  	ts->last_jiffies = basejiff;
  
- 	if (rcu_needs_cpu(basemono, &next_rcu) ||
+ 	/*
 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
 index d831827d7ab0..76d982c11ac3 100644
 --- a/kernel/time/timekeeping.c
diff --git a/debian/patches/features/all/rt/0248-irqwork-push-most-work-into-softirq-context.patch b/debian/patches/features/all/rt/0248-irqwork-push-most-work-into-softirq-context.patch
index 1a32a5c..f074be1 100644
--- a/debian/patches/features/all/rt/0248-irqwork-push-most-work-into-softirq-context.patch
+++ b/debian/patches/features/all/rt/0248-irqwork-push-most-work-into-softirq-context.patch
@@ -192,5 +192,5 @@ index d8e1c2c5397c..fad6d60bf4e0 100644
 +#endif
 +
  	__run_timers(base);
- 	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
+ 	if (IS_ENABLED(CONFIG_NO_HZ_COMMON))
  		__run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
diff --git a/debian/patches/features/all/rt/0249-irqwork-Move-irq-safe-work-to-irq-context.patch b/debian/patches/features/all/rt/0249-irqwork-Move-irq-safe-work-to-irq-context.patch
index 9966940..f85d53d 100644
--- a/debian/patches/features/all/rt/0249-irqwork-Move-irq-safe-work-to-irq-context.patch
+++ b/debian/patches/features/all/rt/0249-irqwork-Move-irq-safe-work-to-irq-context.patch
@@ -81,4 +81,4 @@ index fad6d60bf4e0..31703677505f 100644
 +	irq_work_tick_soft();
  
  	__run_timers(base);
- 	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
+ 	if (IS_ENABLED(CONFIG_NO_HZ_COMMON))

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