ignatenkobrain / rpms / kernel

Forked from rpms/kernel 3 years ago
Clone
aa5af0
diff -aurp a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
aa5af0
--- a/arch/x86/kernel/cpu/mcheck/mce.c	2019-10-05 05:27:35.000000000 -0300
aa5af0
+++ b/arch/x86/kernel/cpu/mcheck/mce.c	2020-03-30 12:06:36.546549480 -0300
aa5af0
@@ -52,6 +52,13 @@
aa5af0
 
aa5af0
 #include "mce-internal.h"
aa5af0
 
aa5af0
+#ifndef set_mce_nospec
aa5af0
+static inline int set_mce_nospec(unsigned long pfn)
aa5af0
+{
aa5af0
+	return 0;
aa5af0
+}
aa5af0
+#endif
aa5af0
+
aa5af0
 static DEFINE_MUTEX(mce_chrdev_read_mutex);
aa5af0
 
aa5af0
 #define mce_log_get_idx_check(p) \
aa5af0
diff -aurp a/drivers/scsi/megaraid/megaraid_sas_debugfs.c b/drivers/scsi/megaraid/megaraid_sas_debugfs.c
aa5af0
--- a/drivers/scsi/megaraid/megaraid_sas_debugfs.c	2019-10-05 05:27:35.000000000 -0300
aa5af0
+++ b/drivers/scsi/megaraid/megaraid_sas_debugfs.c	2020-03-30 13:20:30.225702075 -0300
aa5af0
@@ -28,6 +28,7 @@
aa5af0
 #include <linux/kernel.h>
aa5af0
 #include <linux/types.h>
aa5af0
 #include <linux/pci.h>
aa5af0
+#include <linux/uio.h>
aa5af0
 #include <linux/interrupt.h>
aa5af0
 #include <linux/compat.h>
aa5af0
 #include <linux/irq_poll.h>