1 files changed, 0 insertions, 117 deletions
diff --git a/meta-snowyowl/recipes-kernel/linux/files/0049-x86-mcheck-Move-CPU_DEAD-to-hotplug-state-machine.patch b/meta-snowyowl/recipes-kernel/linux/files/0049-x86-mcheck-Move-CPU_DEAD-to-hotplug-state-machine.patch
deleted file mode 100755
index 14733cd4..00000000
--- a/meta-snowyowl/recipes-kernel/linux/files/0049-x86-mcheck-Move-CPU_DEAD-to-hotplug-state-machine.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From ab230cbf5fd514fed40d37e424b6c102f5afd26e Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Date: Thu, 10 Nov 2016 18:44:47 +0100
-Subject: [PATCH 049/154] x86/mcheck: Move CPU_DEAD to hotplug state machine
-
-This moves the last piece of the old hotplug notifier code in MCE to the
-new hotplug state machine.
-
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Acked-by: Borislav Petkov <bp@alien8.de>
-Cc: Tony Luck <tony.luck@intel.com>
-Cc: rt@linutronix.de
-Cc: linux-edac@vger.kernel.org
-Link: http://lkml.kernel.org/r/20161110174447.11848-8-bigeasy@linutronix.de
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
----
- arch/x86/kernel/cpu/mcheck/mce.c | 42 ++++++++++++++--------------------------
- include/linux/cpuhotplug.h       |  1 +
- 2 files changed, 16 insertions(+), 27 deletions(-)
-
-diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index 67a2dcd..a032944 100644
---- a/arch/x86/kernel/cpu/mcheck/mce.c
-+++ b/arch/x86/kernel/cpu/mcheck/mce.c
-@@ -2550,26 +2550,14 @@ static void mce_reenable_cpu(void)
- 	}
- }
- 
--/* Get notified when a cpu comes on/off. Be hotplug friendly. */
--static int
--mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
-+static int mce_cpu_dead(unsigned int cpu)
- {
--	unsigned int cpu = (unsigned long)hcpu;
-+	mce_intel_hcpu_update(cpu);
- 
--	switch (action & ~CPU_TASKS_FROZEN) {
--	case CPU_DEAD:
--		mce_intel_hcpu_update(cpu);
--
--		/* intentionally ignoring frozen here */
--		if (!(action & CPU_TASKS_FROZEN))
--			cmci_rediscover();
--		break;
--	case CPU_DOWN_PREPARE:
--
--		break;
--	}
--
--	return NOTIFY_OK;
-+	/* intentionally ignoring frozen here */
-+	if (!cpuhp_tasks_frozen)
-+		cmci_rediscover();
-+	return 0;
- }
- 
- static int mce_cpu_online(unsigned int cpu)
-@@ -2600,10 +2588,6 @@ static int mce_cpu_pre_down(unsigned int cpu)
- 	return 0;
- }
- 
--static struct notifier_block mce_cpu_notifier = {
--	.notifier_call = mce_cpu_callback,
--};
--
- static __init void mce_init_banks(void)
- {
- 	int i;
-@@ -2643,16 +2627,17 @@ static __init int mcheck_init_device(void)
- 	if (err)
- 		goto err_out_mem;
- 
-+	err = cpuhp_setup_state(CPUHP_X86_MCE_DEAD, "x86/mce:dead", NULL,
-+				mce_cpu_dead);
-+	if (err)
-+		goto err_out_mem;
-+
- 	err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/mce:online",
- 				mce_cpu_online, mce_cpu_pre_down);
- 	if (err < 0)
--		goto err_out_mem;
-+		goto err_out_online;
- 	hp_online = err;
- 
--	cpu_notifier_register_begin();
--	__register_hotcpu_notifier(&mce_cpu_notifier);
--	cpu_notifier_register_done();
--
- 	register_syscore_ops(&mce_syscore_ops);
- 
- 	/* register character device /dev/mcelog */
-@@ -2666,6 +2651,9 @@ static __init int mcheck_init_device(void)
- 	unregister_syscore_ops(&mce_syscore_ops);
- 	cpuhp_remove_state(hp_online);
- 
-+err_out_online:
-+	cpuhp_remove_state(CPUHP_X86_MCE_DEAD);
-+
- err_out_mem:
- 	free_cpumask_var(mce_device_initialized);
- 
-diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
-index ba1cad7..ac8bbe0 100644
---- a/include/linux/cpuhotplug.h
-+++ b/include/linux/cpuhotplug.h
-@@ -16,6 +16,7 @@ enum cpuhp_state {
- 	CPUHP_PERF_SUPERH,
- 	CPUHP_X86_HPET_DEAD,
- 	CPUHP_X86_APB_DEAD,
-+	CPUHP_X86_MCE_DEAD,
- 	CPUHP_VIRT_NET_DEAD,
- 	CPUHP_SLUB_DEAD,
- 	CPUHP_MM_WRITEBACK_DEAD,
--- 
-2.7.4
-