[linux] 01/01: [mips*] inst: Avoid ABI change in 3.16.51

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie
in repository linux.

commit 0fd5fdae5f6459061232ec5162284a056ad99575
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Dec 3 17:54:23 2017 +0000

    [mips*] inst: Avoid ABI change in 3.16.51
---
 debian/changelog                                   |  6 ++++++
 .../mips-inst-avoid-abi-change-in-3.16.51.patch    | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4b5622b..977e1ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux (3.16.51-2) jessie; urgency=medium
+
+  * [mips*] inst: Avoid ABI change in 3.16.51
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 03 Dec 2017 17:53:10 +0000
+
 linux (3.16.51-1) jessie; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/patches/debian/mips-inst-avoid-abi-change-in-3.16.51.patch b/debian/patches/debian/mips-inst-avoid-abi-change-in-3.16.51.patch
new file mode 100644
index 0000000..e746afb
--- /dev/null
+++ b/debian/patches/debian/mips-inst-avoid-abi-change-in-3.16.51.patch
@@ -0,0 +1,25 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 03 Dec 2017 17:48:24 +0000
+Subject: mips: inst: Avoid ABI change in 3.16.51
+Forwarded: not-needed
+
+Commit cea8cd498f4f "MIPS: microMIPS: Fix decoding of swsp16 instruction"
+changed the signed-ness (and name!) of a field of struct mm16_r5_format.
+This indirectly changes the ABI of kprobes.  I don't think the change is
+really that important, so hide it from genksyms.
+
+---
+--- a/arch/mips/include/uapi/asm/inst.h
++++ b/arch/mips/include/uapi/asm/inst.h
+@@ -808,7 +808,11 @@ struct mm16_r3_format {		/* Load from gl
+ struct mm16_r5_format {		/* Load/store from stack pointer format */
+ 	__BITFIELD_FIELD(unsigned int opcode : 6,
+ 	__BITFIELD_FIELD(unsigned int rt : 5,
++#if !defined(__KERNEL__) || !defined(__GENKSYMS__)
+ 	__BITFIELD_FIELD(unsigned int imm : 5,
++#else
++	__BITFIELD_FIELD(signed int simmediate : 5,
++#endif
+ 	__BITFIELD_FIELD(unsigned int : 16, /* Ignored */
+ 	;))))
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 8a61baf..4cd4a73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -756,3 +756,4 @@ debian/ip_fib-avoid-abi-change-in-3.16.50.patch
 debian/mm-avoid-abi-change-in-3.16.50.patch
 debian/inet_frag-limit-abi-change-in-3.16.51.patch
 debian/s390-mm-avoid-abi-change-in-3.16.51.patch
+debian/mips-inst-avoid-abi-change-in-3.16.51.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git