[kernel] r12499 - dists/etch-security/linux-2.6/debian/patches/bugfix

[Dann Frazier]

Author: dannf
Date: Wed Dec 10 14:48:58 2008
New Revision: 12499

Log:
ignore abi changes due to addition field in struct scm_fp_list

Modified:
   dists/etch-security/linux-2.6/debian/patches/bugfix/net-fix-recursive-descent-in-__scm_destroy-abi-ignore.patch

Modified: dists/etch-security/linux-2.6/debian/patches/bugfix/net-fix-recursive-descent-in-__scm_destroy-abi-ignore.patch
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/bugfix/net-fix-recursive-descent-in-__scm_destroy-abi-ignore.patch	(original)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/net-fix-recursive-descent-in-__scm_destroy-abi-ignore.patch	Wed Dec 10 14:48:58 2008
@@ -10,3 +10,19 @@
  };
  
  static inline pid_t process_group(struct task_struct *tsk)
+diff -urpN a/include/net/scm.h b/include/net/scm.h
+--- a/include/net/scm.h	2008-12-10 00:18:25.000000000 -0700
++++ b/include/net/scm.h	2008-12-10 00:24:38.000000000 -0700
+@@ -12,9 +12,11 @@
+ 
+ struct scm_fp_list
+ {
+-	struct list_head	list;
+ 	int			count;
+ 	struct file		*fp[SCM_MAX_FD];
++#ifndef __GENKSYMS__
++	struct list_head	list;
++#endif
+ };
+ 
+ struct scm_cookie