Home Home > GIT Browse > SLE12-SP5
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-05-27 10:38:44 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-05-27 10:38:44 +0200
commitc40a30a6f91db538ac7bcc6518cee624025c47b2 (patch)
tree18ed4c0fc7d23bf671d17aac68dcf46b7a470f04
parent6908e10c3585bf1f00036fe567f4541de13f165e (diff)
Delete patches.kabi/*SLE12-SP5
-rw-r--r--arch/arm64/include/asm/acpi.h3
-rw-r--r--include/linux/mlx5/driver.h2
-rw-r--r--include/linux/mm_types.h2
-rw-r--r--include/linux/usb.h1
-rw-r--r--include/net/ip.h3
-rw-r--r--include/net/smc.h2
-rw-r--r--include/sound/seq_kernel.h2
-rw-r--r--net/ipv4/ip_input.c2
-rw-r--r--net/ipv4/ip_options.c8
-rw-r--r--net/smc/af_smc.c2
-rw-r--r--net/smc/smc_ib.h6
-rw-r--r--sound/core/init.c3
-rw-r--r--sound/core/seq/seq_clientmgr.c17
13 files changed, 6 insertions, 47 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
index ad7aacb80cbc..709208dfdc8b 100644
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@ -12,10 +12,7 @@
#ifndef _ASM_ACPI_H
#define _ASM_ACPI_H
-#ifndef __GENKSYMS__
#include <linux/efi.h>
-#endif
-
#include <linux/memblock.h>
#include <linux/psci.h>
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 4682d5d67d8e..4660bdeb9f1f 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -776,9 +776,7 @@ struct mlx5_pagefault {
struct mlx5_td {
/* protects tirs list changes while tirs refresh */
-#ifndef __GENKSYMS__
struct mutex list_lock;
-#endif
struct list_head tirs_list;
u32 tdn;
};
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index acaef273b8bb..3fac979f6251 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -57,9 +57,7 @@ struct page {
/* Second double word */
union {
-#ifndef __GENKSYMS__
atomic_t pt_frag_refcount; /* powerpc */
-#endif
pgoff_t index; /* Our offset within mapping. */
void *freelist; /* sl[aou]b first free object */
/* page_deferred_list().prev -- second tail page */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 38d53399144e..c226aa746752 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -255,7 +255,6 @@ struct usb_interface {
struct device dev; /* interface specific device info */
struct device *usb_dev;
- atomic_t pm_usage_cnt; /* XXX placeholder only for kABI */
struct work_struct reset_ws; /* for resets in atomic context */
void *suse_kabi_padding;
};
diff --git a/include/net/ip.h b/include/net/ip.h
index 6992833dc754..d50cdd7f0c16 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -595,8 +595,7 @@ int ip_options_get_from_user(struct net *net, struct ip_options_rcu **optp,
unsigned char __user *data, int optlen);
void ip_options_undo(struct ip_options *opt);
void ip_forward_options(struct sk_buff *skb);
-int ip_options_rcv_srr(struct sk_buff *skb);
-int ip_options_rcv_srr2(struct sk_buff *skb, struct net_device *dev);
+int ip_options_rcv_srr(struct sk_buff *skb, struct net_device *dev);
/*
* Functions provided by ip_sockglue.c
diff --git a/include/net/smc.h b/include/net/smc.h
index 58acbf7bf7a1..19d2f514f178 100644
--- a/include/net/smc.h
+++ b/include/net/smc.h
@@ -73,9 +73,7 @@ struct smcd_dev {
struct list_head vlan;
struct workqueue_struct *event_wq;
u8 pnetid[SMC_MAX_PNETID_LEN];
-#ifndef __GENKSYMS__
bool pnetid_by_user;
-#endif
};
struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name,
diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h
index e43d04a1d663..c7a5433e109a 100644
--- a/include/sound/seq_kernel.h
+++ b/include/sound/seq_kernel.h
@@ -73,8 +73,6 @@ __printf(3, 4)
int snd_seq_create_kernel_client(struct snd_card *card, int client_index,
const char *name_fmt, ...);
int snd_seq_delete_kernel_client(int client);
-/* XXX kABI compatibility for SLE15 XXX */
-#define snd_seq_kernel_client_enqueue __snd_seq_kernel_client_enqueue
int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev,
struct file *file, bool blocking);
int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event *ev, int atomic, int hop);
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 8e4a143727ce..4aa77d6df975 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -298,7 +298,7 @@ static inline bool ip_rcv_options(struct sk_buff *skb, struct net_device *dev)
}
}
- if (ip_options_rcv_srr2(skb, dev))
+ if (ip_options_rcv_srr(skb, dev))
goto drop;
}
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 4986a497850d..29d60c2d0219 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -614,7 +614,7 @@ void ip_forward_options(struct sk_buff *skb)
}
}
-int ip_options_rcv_srr2(struct sk_buff *skb, struct net_device *dev)
+int ip_options_rcv_srr(struct sk_buff *skb, struct net_device *dev)
{
struct ip_options *opt = &(IPCB(skb)->opt);
int srrspace, srrptr;
@@ -670,10 +670,4 @@ int ip_options_rcv_srr2(struct sk_buff *skb, struct net_device *dev)
}
return 0;
}
-EXPORT_SYMBOL(ip_options_rcv_srr2);
-
-int ip_options_rcv_srr(struct sk_buff *skb)
-{
- return ip_options_rcv_srr2(skb, skb->dev);
-}
EXPORT_SYMBOL(ip_options_rcv_srr);
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index eff394ebc0ca..8e4241c8b466 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -31,9 +31,7 @@
#include <asm/ioctls.h>
#include <net/net_namespace.h>
-#ifndef __GENKSYMS__
#include <net/netns/generic.h>
-#endif
#include "smc_netns.h"
#include "smc.h"
diff --git a/net/smc/smc_ib.h b/net/smc/smc_ib.h
index f6fbe6c79976..97845c490ea1 100644
--- a/net/smc/smc_ib.h
+++ b/net/smc/smc_ib.h
@@ -41,13 +41,11 @@ struct smc_ib_device { /* ib-device infos for smc */
/* mac address per port*/
u8 pnetid[SMC_MAX_PORTS][SMC_MAX_PNETID_LEN];
/* pnetid per port */
+ bool pnetid_by_user[SMC_MAX_PORTS];
+ /* pnetid defined by user? */
u8 initialized : 1; /* ib dev CQ, evthdl done */
struct work_struct port_event_work;
unsigned long port_event_mask;
-#ifndef __GENKSYMS__
- bool pnetid_by_user[SMC_MAX_PORTS];
- /* pnetid defined by user? */
-#endif
};
struct smc_buf_desc;
diff --git a/sound/core/init.c b/sound/core/init.c
index 1df7011d47bb..1a450a651a37 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -49,8 +49,7 @@ static const struct file_operations snd_shutdown_f_ops;
/* locked for registering/using */
static DECLARE_BITMAP(snd_cards_lock, SNDRV_CARDS);
-struct snd_card *snd_cards[SNDRV_CARDS];
-EXPORT_SYMBOL(snd_cards); /* XXX exported only for SLE15 kABI compatibility */
+static struct snd_card *snd_cards[SNDRV_CARDS];
static DEFINE_MUTEX(snd_card_mutex);
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index b2c4d4ad8799..a1439e7d8a2b 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -2543,20 +2543,3 @@ void snd_sequencer_device_done(void)
snd_unregister_device(&seq_dev);
put_device(&seq_dev);
}
-
-/* XXX kABI compatibility for SLE15 XXX */
-#undef snd_seq_kernel_client_enqueue
-int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev,
- int atomic, int hop)
-{
- return __snd_seq_kernel_client_enqueue(client, ev, NULL, false);
-}
-EXPORT_SYMBOL(snd_seq_kernel_client_enqueue);
-
-int snd_seq_kernel_client_enqueue_blocking(int client, struct snd_seq_event *ev,
- struct file *file, int atomic,
- int hop)
-{
- return __snd_seq_kernel_client_enqueue(client, ev, file, true);
-}
-EXPORT_SYMBOL(snd_seq_kernel_client_enqueue_blocking);