debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Drop ABI maintenance patches since we're bumping the ABI number

This commit is contained in:
Ben Hutchings 2016-08-12 16:22:46 +01:00
parent aebb6e776f
commit d62992a05c
4 changed files with 0 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
debian/patches/debian/bridge-fix-abi-change-in-4.6.4.patch vendored
View File

@ -1,24 +0,0 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 14 Jul 2016 00:30:57 +0100
Subject: bridge: Fix ABI change in 4.6.4
Forwarded: not-needed
Although this structure is private, it affects the symbol version for
br_deliver() which is called from a netfilter module
Hide the new bitfield from genksyms.
---
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -304,7 +304,10 @@ struct net_bridge
u8 multicast_disabled:1;
u8 multicast_querier:1;
u8 multicast_query_use_ifaddr:1;
+#ifndef __GENKSYMS__
u8 has_ipv6_addr:1;
+ /* 4 bits padding */
+#endif
u32 hash_elasticity;
u32 hash_max;

106
debian/patches/debian/mips-libgcc-fix-abi-change-in-4.6.2.patch vendored
View File

@ -1,106 +0,0 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 17 Jun 2016 01:46:59 +0100
Subject: MIPS: libgcc: Fix ABI change in 4.6.2
Forwarded: not-needed
Commit aedcfbe06558 ("MIPS: lib: Mark intrinsics notrace") causes the
hashes of these functions to change, even though their ABI hasn't.
Hide the 'notrace' from genksyms.
---
--- a/arch/mips/lib/ashldi3.c
+++ b/arch/mips/lib/ashldi3.c
@@ -2,6 +2,11 @@
#include "libgcc.h"
+#ifdef __GENKSYMS__
+#undef notrace
+#define notrace
+#endif
+
long long notrace __ashldi3(long long u, word_type b)
{
DWunion uu, w;
--- a/arch/mips/lib/ashrdi3.c
+++ b/arch/mips/lib/ashrdi3.c
@@ -2,6 +2,11 @@
#include "libgcc.h"
+#ifdef __GENKSYMS__
+#undef notrace
+#define notrace
+#endif
+
long long notrace __ashrdi3(long long u, word_type b)
{
DWunion uu, w;
--- a/arch/mips/lib/bswapdi.c
+++ b/arch/mips/lib/bswapdi.c
@@ -1,5 +1,10 @@
#include <linux/module.h>
+#ifdef __GENKSYMS__
+#undef notrace
+#define notrace
+#endif
+
unsigned long long notrace __bswapdi2(unsigned long long u)
{
return (((u) & 0xff00000000000000ull) >> 56) |
--- a/arch/mips/lib/bswapsi.c
+++ b/arch/mips/lib/bswapsi.c
@@ -1,5 +1,10 @@
#include <linux/module.h>
+#ifdef __GENKSYMS__
+#undef notrace
+#define notrace
+#endif
+
unsigned int notrace __bswapsi2(unsigned int u)
{
return (((u) & 0xff000000) >> 24) |
--- a/arch/mips/lib/cmpdi2.c
+++ b/arch/mips/lib/cmpdi2.c
@@ -2,6 +2,11 @@
#include "libgcc.h"
+#ifdef __GENKSYMS__
+#undef notrace
+#define notrace
+#endif
+
word_type notrace __cmpdi2(long long a, long long b)
{
const DWunion au = {
--- a/arch/mips/lib/lshrdi3.c
+++ b/arch/mips/lib/lshrdi3.c
@@ -2,6 +2,11 @@
#include "libgcc.h"
+#ifdef __GENKSYMS__
+#undef notrace
+#define notrace
+#endif
+
long long notrace __lshrdi3(long long u, word_type b)
{
DWunion uu, w;
--- a/arch/mips/lib/ucmpdi2.c
+++ b/arch/mips/lib/ucmpdi2.c
@@ -2,6 +2,11 @@
#include "libgcc.h"
+#ifdef __GENKSYMS__
+#undef notrace
+#define notrace
+#endif
+
word_type notrace __ucmpdi2(unsigned long long a, unsigned long long b)
{
const DWunion au = {.ll = a};

92
debian/patches/debian/mips-siginfo-fix-abi-change-in-4.6.2.patch vendored
View File

@ -1,92 +0,0 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 16 Jun 2016 11:32:49 +0100
Subject: MIPS: siginfo: Fix ABI change in 4.6.2
Forwarded: not-needed
genksyms only looks at the (preprocessed) token stream of a struct
definition, not the real types, so commit 5daebc477da4 ("MIPS: Fix
siginfo.h to use strict posix types") results in a different hash
even though it doesn't change types.
--- a/arch/mips/include/uapi/asm/siginfo.h
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -30,6 +30,8 @@
#include <asm-generic/siginfo.h>
+#ifndef __GENKSYMS__
+
/* We can't use generic siginfo_t, because our si_code and si_errno are swapped */
typedef struct siginfo {
int si_signo;
@@ -112,6 +114,70 @@ typedef struct siginfo {
} _sifields;
} siginfo_t;
+#else /* __GENKSYMS__ */
+
+/* Definition using the 'wrong' type names, to keep genksyms happy */
+typedef struct siginfo {
+ int si_signo;
+ int si_code;
+ int si_errno;
+ int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
+ union {
+ int _pad[SI_PAD_SIZE];
+ struct {
+ pid_t _pid;
+ __ARCH_SI_UID_T _uid;
+ } _kill;
+ struct {
+ timer_t _tid;
+ int _overrun;
+ char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
+ sigval_t _sigval;
+ int _sys_private;
+ } _timer;
+ struct {
+ pid_t _pid;
+ __ARCH_SI_UID_T _uid;
+ sigval_t _sigval;
+ } _rt;
+ struct {
+ pid_t _pid;
+ __ARCH_SI_UID_T _uid;
+ int _status;
+ clock_t _utime;
+ clock_t _stime;
+ } _sigchld;
+ struct {
+ pid_t _pid;
+ clock_t _utime;
+ int _status;
+ clock_t _stime;
+ } _irix_sigchld;
+ struct {
+ void __user *_addr;
+ short _addr_lsb;
+ union {
+ struct {
+ void __user *_lower;
+ void __user *_upper;
+ } _addr_bnd;
+ __u32 _pkey;
+ };
+ } _sigfault;
+ struct {
+ __ARCH_SI_BAND_T _band;
+ int _fd;
+ } _sigpoll;
+ struct {
+ void __user *_call_addr;
+ int _syscall;
+ unsigned int _arch;
+ } _sigsys;
+ } _sifields;
+} siginfo_t;
+
+#endif /* __GENKSYMS__ */
+
/*
* si_code values
* Again these have been chosen to be IRIX compatible.

3
debian/patches/series vendored
View File

@ -107,9 +107,6 @@ bugfix/all/rds-fix-an-infoleak-in-rds_inc_info_copy.patch
bugfix/all/tcp-make-challenge-acks-less-predictable.patch
# ABI maintenance
debian/mips-siginfo-fix-abi-change-in-4.6.2.patch
debian/mips-libgcc-fix-abi-change-in-4.6.2.patch
debian/bridge-fix-abi-change-in-4.6.4.patch
# Tools bug fixes
bugfix/all/usbip-document-tcp-wrappers.patch