[linux] 02/06: pids: Avoid ABI change in 4.12.9

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch sid
in repository linux.

commit c755b1fcfd7bbea07442ab86a5ba83644ce621b9
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Aug 31 01:28:44 2017 +0100

    pids: Avoid ABI change in 4.12.9
---
 debian/changelog                                   |  1 +
 .../debian/pids-avoid-abi-change-in-4.12.9.patch   | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 393c699..822b7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -211,6 +211,7 @@ linux (4.12.10-1) UNRELEASED; urgency=medium
   * cpupower: Add/update definition of MSRHEADER macro for turbostat and
     x86_energy_perf_policy (Closes: #872414)
   * Ignore ABI changes in nand and perf_event subsystems
+  * pids: Avoid ABI change in 4.12.9
 
   [ Roger Shimizu ]
   * [armel] Disable CONFIG_STRICT_KERNEL_RWX, which will save about 3MB
diff --git a/debian/patches/debian/pids-avoid-abi-change-in-4.12.9.patch b/debian/patches/debian/pids-avoid-abi-change-in-4.12.9.patch
new file mode 100644
index 0000000..800a85c
--- /dev/null
+++ b/debian/patches/debian/pids-avoid-abi-change-in-4.12.9.patch
@@ -0,0 +1,55 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 31 Aug 2017 01:26:42 +0100
+Subject: pids: Avoid ABI change in 4.12.9
+Forwarded: not-needed
+
+Commit dd1c1f2f2028 "pids: make task_tgid_nr_ns() safe" changed
+task_tgid_nr_ns() from an exported extern function to a static inline.
+Change it back.
+
+---
+--- a/include/linux/pid.h
++++ b/include/linux/pid.h
+@@ -8,9 +8,12 @@ enum pid_type
+ 	PIDTYPE_PID,
+ 	PIDTYPE_PGID,
+ 	PIDTYPE_SID,
+-	PIDTYPE_MAX,
++	PIDTYPE_MAX
++#ifndef __GENKSYMS__
++	,
+ 	/* only valid to __task_pid_nr_ns() */
+ 	__PIDTYPE_TGID
++#endif
+ };
+ 
+ /*
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -540,6 +540,12 @@ pid_t __task_pid_nr_ns(struct task_struc
+ }
+ EXPORT_SYMBOL(__task_pid_nr_ns);
+ 
++pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
++{
++	return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, ns);
++}
++EXPORT_SYMBOL(task_tgid_nr_ns);
++
+ struct pid_namespace *task_active_pid_ns(struct task_struct *tsk)
+ {
+ 	return ns_of_pid(task_pid(tsk));
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1168,10 +1168,7 @@ static inline pid_t task_session_vnr(str
+ 	return __task_pid_nr_ns(tsk, PIDTYPE_SID, NULL);
+ }
+ 
+-static inline pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
+-{
+-	return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, ns);
+-}
++extern pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
+ 
+ static inline pid_t task_tgid_vnr(struct task_struct *tsk)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index ac0a474..24ba534 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -129,6 +129,7 @@ bugfix/alpha/alpha-restore-symbol-versions-for-symbols-exported-f.patch
 bugfix/all/module-disable-matching-missing-version-crc.patch
 
 # ABI maintenance
+debian/pids-avoid-abi-change-in-4.12.9.patch
 
 # Tools bug fixes
 bugfix/all/usbip-document-tcp-wrappers.patch

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