|
 |
6eda94 |
centos 7.7 plus kerenl patch for i686
|
|
|
6eda94 |
|
|
|
6eda94 |
Written-by: Pablo Greco <pablo@fliagreco.com.ar>
|
|
|
6eda94 |
|
|
|
6eda94 |
diff -aurp a/drivers/net/ethernet/intel/ice/ice_osdep.h b/drivers/net/ethernet/intel/ice/ice_osdep.h
|
|
|
6eda94 |
--- a/drivers/net/ethernet/intel/ice/ice_osdep.h 2019-07-18 16:58:03.000000000 -0300
|
|
|
6eda94 |
+++ b/drivers/net/ethernet/intel/ice/ice_osdep.h 2019-08-08 23:16:36.399822146 -0300
|
|
|
6eda94 |
@@ -7,7 +7,7 @@
|
|
|
6eda94 |
#include <linux/types.h>
|
|
|
6eda94 |
#include <linux/io.h>
|
|
|
6eda94 |
#ifndef CONFIG_64BIT
|
|
|
6eda94 |
-#include <linux/io-64-nonatomic-lo-hi.h>
|
|
|
6eda94 |
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
|
|
6eda94 |
#endif
|
|
|
6eda94 |
|
|
|
6eda94 |
#define wr32(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
|
|
|
6eda94 |
diff -aurp a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c
|
|
|
6eda94 |
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c 2019-07-18 16:58:03.000000000 -0300
|
|
|
6eda94 |
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c 2019-08-08 22:55:29.332993839 -0300
|
|
|
6eda94 |
@@ -219,7 +219,7 @@ nfp_flower_cmsg_merge_hint_rx(struct nfp
|
|
|
6eda94 |
flow_cnt = msg->count + 1;
|
|
|
6eda94 |
|
|
|
6eda94 |
if (msg_len < struct_size(msg, flow, flow_cnt)) {
|
|
|
6eda94 |
- nfp_flower_cmsg_warn(app, "Merge hint ctrl msg too short - %d bytes but expect %ld\n",
|
|
|
6eda94 |
+ nfp_flower_cmsg_warn(app, "Merge hint ctrl msg too short - %d bytes but expect %zd\n",
|
|
|
6eda94 |
msg_len, struct_size(msg, flow, flow_cnt));
|
|
|
6eda94 |
return;
|
|
|
6eda94 |
}
|
|
|
6eda94 |
diff -aurp a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
|
|
|
6eda94 |
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c 2019-07-18 16:58:03.000000000 -0300
|
|
|
6eda94 |
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c 2019-08-08 23:17:47.859935008 -0300
|
|
|
6eda94 |
@@ -63,6 +63,9 @@
|
|
|
6eda94 |
#include "qed_sriov.h"
|
|
|
6eda94 |
#include "qed_vf.h"
|
|
|
6eda94 |
#include "qed_rdma.h"
|
|
|
6eda94 |
+#ifndef CONFIG_64BIT
|
|
|
6eda94 |
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
|
|
|
6eda94 |
+#endif
|
|
|
6eda94 |
|
|
|
6eda94 |
static DEFINE_SPINLOCK(qm_lock);
|
|
|
6eda94 |
|
|
|
6eda94 |
diff -aurp a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
|
|
|
6eda94 |
--- a/fs/gfs2/bmap.c 2019-07-18 16:58:03.000000000 -0300
|
|
|
6eda94 |
+++ b/fs/gfs2/bmap.c 2019-08-08 22:18:24.501014640 -0300
|
|
|
6eda94 |
@@ -813,9 +813,9 @@ static int gfs2_iomap_get(struct inode *
|
|
|
6eda94 |
sector_t lblock_stop;
|
|
|
6eda94 |
int ret;
|
|
|
6eda94 |
int eob;
|
|
|
6eda94 |
- u64 len;
|
|
|
6eda94 |
+ u64 uninitialized_var(len);
|
|
|
6eda94 |
struct buffer_head *dibh = NULL, *bh;
|
|
|
6eda94 |
- u8 height;
|
|
|
6eda94 |
+ u8 uninitialized_var(height);
|
|
|
6eda94 |
|
|
|
6eda94 |
if (!length)
|
|
|
6eda94 |
return -EINVAL;
|
|
|
6eda94 |
diff -aurp a/include/linux/fs.h b/include/linux/fs.h
|
|
|
6eda94 |
--- a/include/linux/fs.h 2019-07-18 16:58:03.000000000 -0300
|
|
|
6eda94 |
+++ b/include/linux/fs.h 2019-08-08 22:18:24.496014844 -0300
|
|
|
6eda94 |
@@ -681,7 +681,7 @@ struct inode {
|
|
|
6eda94 |
struct fsnotify_mark_connector __rcu *i_fsnotify_marks)
|
|
|
6eda94 |
#endif
|
|
|
6eda94 |
|
|
|
6eda94 |
-#if defined(CONFIG_IMA) && defined(CONFIG_X86_64)
|
|
|
6eda94 |
+#if defined(CONFIG_IMA) && defined(CONFIG_X86)
|
|
|
6eda94 |
atomic_t i_readcount; /* struct files open RO */
|
|
|
6eda94 |
#endif
|
|
|
6eda94 |
void *i_private; /* fs or device private pointer */
|
|
|
6eda94 |
diff -aurp a/kernel/bpf/core.c b/kernel/bpf/core.c
|
|
|
6eda94 |
--- a/kernel/bpf/core.c 2019-07-18 16:58:03.000000000 -0300
|
|
|
6eda94 |
+++ b/kernel/bpf/core.c 2019-08-08 22:18:24.499014722 -0300
|
|
|
6eda94 |
@@ -1800,6 +1800,12 @@ int bpf_prog_array_copy_info(struct bpf_
|
|
|
6eda94 |
: 0;
|
|
|
6eda94 |
}
|
|
|
6eda94 |
|
|
|
6eda94 |
+#if defined(CONFIG_X86_32)
|
|
|
6eda94 |
+void __weak trace_bpf_jit_free(struct bpf_prog *fp)
|
|
|
6eda94 |
+{
|
|
|
6eda94 |
+}
|
|
|
6eda94 |
+#endif
|
|
|
6eda94 |
+
|
|
|
6eda94 |
static void bpf_prog_free_deferred(struct work_struct *work)
|
|
|
6eda94 |
{
|
|
|
6eda94 |
struct bpf_prog_aux *aux;
|