Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-05-11 17:02:07 +0200
committerKernel Build Daemon <kbuild@suse.de>2018-05-11 17:02:07 +0200
commitafa6adc4bb6ee7960edde84b8a1208bc057840bc (patch)
tree2455a6ccb7f553ad75f8f22e4ee040ebb0217d19
parentbb2e1c126f7018ef616b8c0bfd2d04c98fdfc2eb (diff)
Delete patches.kabi/* workarounds
-rw-r--r--arch/arm64/include/asm/cpucaps.h3
-rw-r--r--drivers/infiniband/hw/mlx5/srq.c14
-rw-r--r--drivers/md/md.h2
-rw-r--r--drivers/usb/musb/musb_core.h2
-rw-r--r--include/linux/mlx5/driver.h8
5 files changed, 10 insertions, 19 deletions
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
index 979c71c029a8..ff89c3ad6d54 100644
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -43,7 +43,6 @@
#define ARM64_HARDEN_BRANCH_PREDICTOR 22
#define ARM64_HARDEN_BP_POST_GUEST_EXIT 23
-/* kabi: reserve 24 - 31 for future cpu capabilities */
-#define ARM64_NCAPS 32
+#define ARM64_NCAPS 24
#endif /* __ASM_CPUCAPS_H */
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index f13360f00f37..3c7522d025f2 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -262,17 +262,17 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
mutex_init(&srq->mutex);
spin_lock_init(&srq->lock);
srq->msrq.max = roundup_pow_of_two(init_attr->attr.max_wr + 1);
- srq->msrq.max_gs_st = init_attr->attr.max_sge;
+ srq->msrq.max_gs = init_attr->attr.max_sge;
desc_size = sizeof(struct mlx5_wqe_srq_next_seg) +
- srq->msrq.max_gs_st * sizeof(struct mlx5_wqe_data_seg);
- if (desc_size == 0 || srq->msrq.max_gs_st > desc_size)
+ srq->msrq.max_gs * sizeof(struct mlx5_wqe_data_seg);
+ if (desc_size == 0 || srq->msrq.max_gs > desc_size)
return ERR_PTR(-EINVAL);
desc_size = roundup_pow_of_two(desc_size);
desc_size = max_t(size_t, 32, desc_size);
if (desc_size < sizeof(struct mlx5_wqe_srq_next_seg))
return ERR_PTR(-EINVAL);
- srq->msrq.max_avail_gather_st = (desc_size - sizeof(struct mlx5_wqe_srq_next_seg)) /
+ srq->msrq.max_avail_gather = (desc_size - sizeof(struct mlx5_wqe_srq_next_seg)) /
sizeof(struct mlx5_wqe_data_seg);
srq->msrq.wqe_shift = ilog2(desc_size);
buf_size = srq->msrq.max * desc_size;
@@ -401,7 +401,7 @@ int mlx5_ib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *srq_attr)
srq_attr->srq_limit = out->lwm;
srq_attr->max_wr = srq->msrq.max - 1;
- srq_attr->max_sge = srq->msrq.max_gs_st;
+ srq_attr->max_sge = srq->msrq.max_gs;
out_box:
kfree(out);
@@ -462,7 +462,7 @@ int mlx5_ib_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
}
for (nreq = 0; wr; nreq++, wr = wr->next) {
- if (unlikely(wr->num_sge > srq->msrq.max_gs_st)) {
+ if (unlikely(wr->num_sge > srq->msrq.max_gs)) {
err = -EINVAL;
*bad_wr = wr;
break;
@@ -486,7 +486,7 @@ int mlx5_ib_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
scat[i].addr = cpu_to_be64(wr->sg_list[i].addr);
}
- if (i < srq->msrq.max_avail_gather_st) {
+ if (i < srq->msrq.max_avail_gather) {
scat[i].byte_count = 0;
scat[i].lkey = cpu_to_be32(MLX5_INVALID_LKEY);
scat[i].addr = 0;
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 5021116ac30c..2a72290f7f1a 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -463,9 +463,7 @@ struct mddev {
struct md_cluster_info *cluster_info;
unsigned int good_device_nr; /* good device num within cluster raid */
-#ifndef __GENKSYMS__
bool has_superblocks:1;
-#endif
};
enum recovery_flags {
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index ef7c7afd1867..155723b810b9 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -427,9 +427,7 @@ struct musb {
unsigned test_mode:1;
unsigned softconnect:1;
-#ifndef __GENKSYMS__
unsigned flush_irq_work:1;
-#endif
u8 address;
u8 test_mode_nr;
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 28b20589e1eb..fb4effcf5a86 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -434,17 +434,13 @@ struct mlx5_core_srq {
struct mlx5_core_rsc_common common; /* must be first */
u32 srqn;
int max;
- int max_gs;
- int max_avail_gather;
+ size_t max_gs;
+ size_t max_avail_gather;
int wqe_shift;
void (*event) (struct mlx5_core_srq *, enum mlx5_event);
atomic_t refcount;
struct completion free;
-#ifndef __GENKSYMS__
- size_t max_gs_st;
- size_t max_avail_gather_st;
-#endif
};
struct mlx5_eq_table {