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

[Maximilian Attems]

Author: maks
Date: Sat Dec 15 23:13:19 2007
New Revision: 9959

Log:
add stable 2.6.23.11


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/2.6.23.11
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	Sat Dec 15 23:13:19 2007
@@ -76,13 +76,16 @@
     - PNP: increase the maximum number of resources
     - sched: some proc entries are missed in sched_domain sys_ctl debug code
     - ATM: [he] initialize lock and tasklet earlier
+  * Add stable release 2.6.23.11:
+    - BRIDGE: Section fix.
+    - Revert "Freezer: Fix APM emulation breakage"
 
   [ Martin Michlmayr ]
   * [arm/iop32x] Re-enable USB_NET and PPP, thanks Daniel Hess (closes:
     #456416).
   * [arm/iop32x] Enable BSD_PROCESS_ACCT and POSIX_MQUEUE (closes: #455892).
 
- -- maximilian attems <maks at debian.org>  Fri, 14 Dec 2007 21:37:54 +0100
+ -- maximilian attems <maks at debian.org>  Sun, 16 Dec 2007 00:11:04 +0100
 
 linux-2.6 (2.6.23-1) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/2.6.23.11
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/2.6.23.11	Sat Dec 15 23:13:19 2007
@@ -0,0 +1,59 @@
+diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
+index 72183bd..ec116df 100644
+--- a/drivers/char/apm-emulation.c
++++ b/drivers/char/apm-emulation.c
+@@ -295,6 +295,7 @@ static int
+ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
+ {
+ 	struct apm_user *as = filp->private_data;
++	unsigned long flags;
+ 	int err = -EINVAL;
+ 
+ 	if (!as->suser || !as->writer)
+@@ -330,16 +331,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
+ 			 * Wait for the suspend/resume to complete.  If there
+ 			 * are pending acknowledges, we wait here for them.
+ 			 */
+-			freezer_do_not_count();
++			flags = current->flags;
+ 
+ 			wait_event(apm_suspend_waitqueue,
+ 				   as->suspend_state == SUSPEND_DONE);
+-
+-			/*
+-			 * Since we are waiting until the suspend is done, the
+-			 * try_to_freeze() in freezer_count() will not trigger
+-			 */
+-			freezer_count();
+ 		} else {
+ 			as->suspend_state = SUSPEND_WAIT;
+ 			mutex_unlock(&state_lock);
+@@ -367,10 +362,14 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
+ 			 * Wait for the suspend/resume to complete.  If there
+ 			 * are pending acknowledges, we wait here for them.
+ 			 */
+-			wait_event_freezable(apm_suspend_waitqueue,
++			flags = current->flags;
++
++			wait_event_interruptible(apm_suspend_waitqueue,
+ 					 as->suspend_state == SUSPEND_DONE);
+ 		}
+ 
++		current->flags = flags;
++
+ 		mutex_lock(&state_lock);
+ 		err = as->suspend_result;
+ 		as->suspend_state = SUSPEND_NONE;
+diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
+index eb57502..bc40377 100644
+--- a/net/bridge/br_fdb.c
++++ b/net/bridge/br_fdb.c
+@@ -44,7 +44,7 @@ int __init br_fdb_init(void)
+ 	return 0;
+ }
+ 
+-void __exit br_fdb_fini(void)
++void br_fdb_fini(void)
+ {
+ 	kmem_cache_destroy(br_fdb_cache);
+ }

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	Sat Dec 15 23:13:19 2007
@@ -2,3 +2,4 @@
 + features/all/export-gfs2-locking-symbols.patch
 + bugfix/sparc/sunfire-get_cpu.patch
 + bugfix/all/2.6.23.10
++ bugfix/all/2.6.23.11