[kernel] r19103 - in dists/sid/linux/debian/patches: . debian

[Ben Hutchings]

Author: benh
Date: Sat Jun  9 03:22:54 2012
New Revision: 19103

Log:
Avoid ABI change for hidepid

Added:
   dists/sid/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch
Modified:
   dists/sid/linux/debian/patches/series

Added: dists/sid/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch	Sat Jun  9 03:22:54 2012	(r19103)
@@ -0,0 +1,16 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Avoid ABI change for hidepid
+
+--- a/include/linux/pid_namespace.h
++++ b/include/linux/pid_namespace.h
+@@ -30,8 +30,10 @@
+ #ifdef CONFIG_BSD_PROCESS_ACCT
+ 	struct bsd_acct_struct *bacct;
+ #endif
++#ifndef __GENKSYMS__
+ 	gid_t pid_gid;
+ 	int hide_pid;
++#endif
+ };
+ 
+ extern struct pid_namespace init_pid_ns;

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sat Jun  9 02:17:54 2012	(r19102)
+++ dists/sid/linux/debian/patches/series	Sat Jun  9 03:22:54 2012	(r19103)
@@ -320,6 +320,8 @@
 features/all/hidepid/0002-procfs-add-hidepid-and-gid-mount-options.patch
 features/all/hidepid/0003-proc-fix-null-pointer-deref-in-proc_pid_permission.patch
 features/all/hidepid/0004-proc-fix-mount-t-proc-o-AAA.patch
+# Temporary, until the next ABI bump
+debian/avoid-ABI-change-for-hidepid.patch
 
 bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch
 bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch