From 217211a302afdfc0e7412f0e7eb7edb72a68d110 Mon Sep 17 00:00:00 2001
From: Akemi Yagi <amyagi@gmail.com>
Date: Apr 20 2020 14:47:35 +0000
Subject: c7 plus kernel: corrections for spec and a patch


Signed-off-by: Akemi Yagi <amyagi@gmail.com>

---

diff --git a/SOURCES/patch-i686-rate-7_8.patch b/SOURCES/patch-i686-rate-7_8.patch
index 2189d28..29ec48e 100644
--- a/SOURCES/patch-i686-rate-7_8.patch
+++ b/SOURCES/patch-i686-rate-7_8.patch
@@ -1,11 +1,11 @@
-diff -aurp a/sound/core/oss/rate.c b/sound/core/oss/rate.c
---- a/sound/core/oss/rate.c	2019-10-05 05:27:35.000000000 -0300
-+++ b/sound/core/oss/rate.c	2020-03-30 17:08:39.702962016 -0300
-@@ -22,6 +22,7 @@
- #include <linux/time.h>
- #include <sound/core.h>
- #include <sound/pcm.h>
-+#include <linux/overflow.h>
- #include "pcm_plugin.h"
- 
- #define SHIFT	11
+diff -aurp a/sound/core/oss/rate.c b/sound/core/oss/rate.c
+--- a/sound/core/oss/rate.c	2019-10-05 05:27:35.000000000 -0300
++++ b/sound/core/oss/rate.c	2020-03-30 17:08:39.702962016 -0300
+@@ -22,6 +22,7 @@
+ #include <linux/time.h>
+ #include <sound/core.h>
+ #include <sound/pcm.h>
++#include <linux/overflow.h>
+ #include "pcm_plugin.h"
+ 
+ #define SHIFT	11
diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec
index a3dc051..b5f50c6 100644
--- a/SPECS/kernel-plus.spec
+++ b/SPECS/kernel-plus.spec
@@ -953,7 +953,7 @@ ApplyOptionalPatch i386-audit-stop-scri-stack-frame.patch
 ApplyOptionalPatch addmissing.patch
 ApplyOptionalPatch morefixes.patch
 ApplyOptionalPatch clear-32bit-Werror-warnings.patch
-ApplyOptionalPatch upstream-32bit-fixes-7_5.patch
+ApplyOptionalPatch upstream-32bit-fixes-7_8.patch
 ApplyOptionalPatch qspinlock_types-32bit.patch
 ApplyOptionalPatch init_32.patch
 ApplyOptionalPatch patch-ioremap-v2.patch
@@ -1000,6 +1000,8 @@ ApplyOptionalPatch patch-i686-nfp-2.patch
 #ApplyOptionalPatch patch-i686-v7_7.patch
 ApplyOptionalPatch patch-i686-v7_7.2.patch
 ApplyOptionalPatch bmap-bug16610.patch
+ApplyOptionalPatch patch-i686-rate-7_8.patch
+ApplyOptionalPatch patch-i686-mce-7_8.patch
 %endif
 
 ### plus mod
@@ -1047,9 +1049,6 @@ ApplyOptionalPatch centos-linux-3.10-acpi-ghes-bug16315.patch
 ApplyOptionalPatch centos-linux-3.10-net-ICMP-report-fix-bug16521.patch
 ApplyOptionalPatch centos-linux-3.10-cifs-fix-bug16824.patch
 ApplyOptionalPatch centos-linux-3.10-r8169-fix-network-stalls.patch
-ApplyOptionalPatch upstream-32bit-fixes-7_8.patch
-ApplyOptionalPatch patch-i686-rate-7_8.patch
-ApplyOptionalPatch patch-i686-mce-7_8.patch
 ### end of plus mod
 # End of CentOS Modification