[kernel] r9992 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable patches/series

[Bastian Blank]

Author: waldi
Date: Thu Dec 20 15:22:31 2007
New Revision: 9992

Log:
Fix abi change in 2.6.23.10.

* debian/changelog: Update.
* debian/patches/bugfix/all/stable/2.6.23.10-abi-1.diff: Add.
* debian/patches/series/2: Update.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.10-abi-1.diff
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Dec 20 15:22:31 2007
@@ -93,6 +93,9 @@
     platform.
   * Add em28xx-dv100.patch to add support for Pinnacle Dazzle DVC 100.
 
+  [ Bastian Blank ]
+  * Fix abi change in 2.6.23.10.
+
  -- maximilian attems <maks at debian.org>  Wed, 19 Dec 2007 18:20:24 +0100
 
 linux-2.6 (2.6.23-1) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.10-abi-1.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.23.10-abi-1.diff	Thu Dec 20 15:22:31 2007
@@ -0,0 +1,25 @@
+diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
+index 9c4ad75..a8d5f33 100644
+--- a/include/linux/thread_info.h
++++ b/include/linux/thread_info.h
+@@ -14,9 +14,12 @@
+  */
+ struct restart_block {
+ 	long (*fn)(struct restart_block *);
++#ifndef __GENKSYMS__
+ 	union {
+ 		struct {
++#endif
+ 			unsigned long arg0, arg1, arg2, arg3;
++#ifndef __GENKSYMS__
+ 		};
+ 		/* For futex_wait */
+ 		struct {
+@@ -26,6 +29,7 @@ struct restart_block {
+ 			u64 time;
+ 		} futex;
+ 	};
++#endif
+ };
+ 
+ extern long do_no_restart_syscall(struct restart_block *parm);

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	(original)
+++ dists/sid/linux-2.6/debian/patches/series/2	Thu Dec 20 15:22:31 2007
@@ -2,6 +2,7 @@
 + features/all/export-gfs2-locking-symbols.patch
 + bugfix/sparc/sunfire-get_cpu.patch
 + bugfix/all/2.6.23.10
++ bugfix/all/stable/2.6.23.10-abi-1.diff
 + bugfix/all/2.6.23.11
 + bugfix/all/iwlwifi-null-deref.patch
 + features/all/em28xx-dv100.patch