[kernel] r16227 - in dists/lenny/linux-2.6/debian: config patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon Aug 30 06:16:32 2010
New Revision: 16227

Log:
Move the new struct parport changes to the end of the struct to avoid ABI
breaking; use ifndef __GENKSYMS__ hack to avoid abichecker error instead of
a regex symbol ignore.

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/parport-quickfix-proc-registration-no-abi-change.patch
Modified:
   dists/lenny/linux-2.6/debian/config/defines
   dists/lenny/linux-2.6/debian/patches/series/25

Modified: dists/lenny/linux-2.6/debian/config/defines
==============================================================================
--- dists/lenny/linux-2.6/debian/config/defines	Mon Aug 30 03:20:24 2010	(r16226)
+++ dists/lenny/linux-2.6/debian/config/defines	Mon Aug 30 06:16:32 2010	(r16227)
@@ -1,6 +1,6 @@
 [abi]
 abiname: 2
-ignore-changes: cn_add_callback gfn_* kvm_* __kvm_* emulate_instruction emulator_read_std emulator_write_emulated fx_init load_pdptrs parport_* saa7134_* saa_dsp_writel ub_sock_snd_queue_add
+ignore-changes: cn_add_callback gfn_* kvm_* __kvm_* emulate_instruction emulator_read_std emulator_write_emulated fx_init load_pdptrs saa7134_* saa_dsp_writel ub_sock_snd_queue_add
 
 [base]
 arches:

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/parport-quickfix-proc-registration-no-abi-change.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/parport-quickfix-proc-registration-no-abi-change.patch	Mon Aug 30 06:16:32 2010	(r16227)
@@ -0,0 +1,20 @@
+--- a/include/linux/parport.h	2010-08-29 18:54:12.000000000 -0600
++++ b/include/linux/parport.h	2010-08-29 19:03:59.000000000 -0600
+@@ -326,12 +326,14 @@ struct parport {
+ 	int spintime;
+ 	atomic_t ref_count;
+ 
++	struct list_head full_list;
++	struct parport *slaves[3];
++
++#ifndef __GENKSYMS__
+ 	unsigned long devflags;
+ #define PARPORT_DEVPROC_REGISTERED	0
+ 	struct pardevice *proc_device;	/* Currently register proc device */
+-
+-	struct list_head full_list;
+-	struct parport *slaves[3];
++#endif
+ };
+ 
+ #define DEFAULT_SPIN_TIME 500 /* us */

Modified: dists/lenny/linux-2.6/debian/patches/series/25
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/25	Mon Aug 30 03:20:24 2010	(r16226)
+++ dists/lenny/linux-2.6/debian/patches/series/25	Mon Aug 30 06:16:32 2010	(r16227)
@@ -7,3 +7,4 @@
 + bugfix/all/guard-page-for-stacks-that-grow-upwards.patch
 + bugfix/all/net-sched-fix-some-kernel-memory-leaks.patch
 + bugfix/all/jfs-dont-allow-os2-xattr-namespace-overlap-with-others.patch
++ bugfix/all/parport-quickfix-proc-registration-no-abi-change.patch