mce: hrtimer: import trivial header refresh (x2)rt-v4.8-558-ge606d81d2d95

2 files changed, 16 insertions, 16 deletions

diff --git a/patches/x86-mce-timer-hrtimer.patch b/patches/x86-mce-timer-hrtimer.patch
index 1cd6e725f5226..7e7159a6e645d 100644
--- a/patches/x86-mce-timer-hrtimer.patch
+++ b/patches/x86-mce-timer-hrtimer.patch
@@ -31,10 +31,10 @@ fold in:
  #include <linux/irq_work.h>
  #include <linux/export.h>
 +#include <linux/jiffies.h>
+ #include <linux/jump_label.h>
  
  #include <asm/processor.h>
- #include <asm/traps.h>
-@@ -1291,7 +1292,7 @@ void mce_log_therm_throt_event(__u64 sta
+@@ -1317,7 +1318,7 @@ void mce_log_therm_throt_event(__u64 sta
  static unsigned long check_interval = INITIAL_CHECK_INTERVAL;
  
  static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */
@@ -43,7 +43,7 @@ fold in:
  
  static unsigned long mce_adjust_timer_default(unsigned long interval)
  {
-@@ -1300,32 +1301,18 @@ static unsigned long mce_adjust_timer_de
+@@ -1326,32 +1327,18 @@ static unsigned long mce_adjust_timer_de
  
  static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;
  
@@ -82,7 +82,7 @@ fold in:
  	iv = __this_cpu_read(mce_next_interval);
  
  	if (mce_available(this_cpu_ptr(&cpu_info))) {
-@@ -1348,7 +1335,7 @@ static void mce_timer_fn(unsigned long d
+@@ -1374,7 +1361,7 @@ static void mce_timer_fn(unsigned long d
  
  done:
  	__this_cpu_write(mce_next_interval, iv);
@@ -91,7 +91,7 @@ fold in:
  }
  
  /*
-@@ -1356,7 +1343,7 @@ static void mce_timer_fn(unsigned long d
+@@ -1382,7 +1369,7 @@ static void mce_timer_fn(unsigned long d
   */
  void mce_timer_kick(unsigned long interval)
  {
@@ -100,7 +100,7 @@ fold in:
  	unsigned long iv = __this_cpu_read(mce_next_interval);
  
  	__restart_timer(t, interval);
-@@ -1371,7 +1358,7 @@ static void mce_timer_delete_all(void)
+@@ -1397,7 +1384,7 @@ static void mce_timer_delete_all(void)
  	int cpu;
  
  	for_each_online_cpu(cpu)
@@ -109,7 +109,7 @@ fold in:
  }
  
  static void mce_do_trigger(struct work_struct *work)
-@@ -1717,7 +1704,7 @@ static void __mcheck_cpu_clear_vendor(st
+@@ -1732,7 +1719,7 @@ static void __mcheck_cpu_clear_vendor(st
  	}
  }
  
@@ -118,7 +118,7 @@ fold in:
  {
  	unsigned long iv = check_interval * HZ;
  
-@@ -1726,16 +1713,17 @@ static void mce_start_timer(unsigned int
+@@ -1741,16 +1728,17 @@ static void mce_start_timer(unsigned int
  
  	per_cpu(mce_next_interval, cpu) = iv;
  
@@ -140,7 +140,7 @@ fold in:
  	mce_start_timer(cpu, t);
  }
  
-@@ -2459,6 +2447,8 @@ static void mce_disable_cpu(void *h)
+@@ -2475,6 +2463,8 @@ static void mce_disable_cpu(void *h)
  	if (!mce_available(raw_cpu_ptr(&cpu_info)))
  		return;
  
@@ -149,7 +149,7 @@ fold in:
  	if (!(action & CPU_TASKS_FROZEN))
  		cmci_clear();
  
-@@ -2481,6 +2471,7 @@ static void mce_reenable_cpu(void *h)
+@@ -2497,6 +2487,7 @@ static void mce_reenable_cpu(void *h)
  		if (b->init)
  			wrmsrl(msr_ops.ctl(i), b->ctl);
  	}
@@ -157,7 +157,7 @@ fold in:
  }
  
  /* Get notified when a cpu comes on/off. Be hotplug friendly. */
-@@ -2488,7 +2479,6 @@ static int
+@@ -2504,7 +2495,6 @@ static int
  mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
  {
  	unsigned int cpu = (unsigned long)hcpu;
@@ -165,7 +165,7 @@ fold in:
  
  	switch (action & ~CPU_TASKS_FROZEN) {
  	case CPU_ONLINE:
-@@ -2508,11 +2498,9 @@ mce_cpu_callback(struct notifier_block *
+@@ -2524,11 +2514,9 @@ mce_cpu_callback(struct notifier_block *
  		break;
  	case CPU_DOWN_PREPARE:
  		smp_call_function_single(cpu, mce_disable_cpu, &action, 1);
diff --git a/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch b/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch
index ac9108589418b..1cca142b1e64f 100644
--- a/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch
+++ b/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch
@@ -65,10 +65,10 @@ Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
  #include <linux/export.h>
  #include <linux/jiffies.h>
 +#include <linux/swork.h>
+ #include <linux/jump_label.h>
  
  #include <asm/processor.h>
- #include <asm/traps.h>
-@@ -1368,6 +1369,56 @@ static void mce_do_trigger(struct work_s
+@@ -1394,6 +1395,56 @@ static void mce_do_trigger(struct work_s
  
  static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
  
@@ -125,7 +125,7 @@ Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
  /*
   * Notify the user(s) about new machine check events.
   * Can be called from interrupt context, but not from machine check/NMI
-@@ -1375,19 +1426,8 @@ static DECLARE_WORK(mce_trigger_work, mc
+@@ -1401,19 +1452,8 @@ static DECLARE_WORK(mce_trigger_work, mc
   */
  int mce_notify_irq(void)
  {
@@ -146,7 +146,7 @@ Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
  		return 1;
  	}
  	return 0;
-@@ -2539,6 +2579,10 @@ static __init int mcheck_init_device(voi
+@@ -2555,6 +2595,10 @@ static __init int mcheck_init_device(voi
  		goto err_out;
  	}