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

[Dann Frazier]

Author: dannf
Date: Sat Feb 20 17:57:47 2010
New Revision: 15249

Log:
replace symbol export to avoid abi change

Modified:
   dists/etch-security/linux-2.6/debian/patches/bugfix/all/connector-delete-buggy-notification-code.patch

Modified: dists/etch-security/linux-2.6/debian/patches/bugfix/all/connector-delete-buggy-notification-code.patch
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/bugfix/all/connector-delete-buggy-notification-code.patch	Sat Feb 20 14:27:40 2010	(r15248)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/all/connector-delete-buggy-notification-code.patch	Sat Feb 20 17:57:47 2010	(r15249)
@@ -1,6 +1,6 @@
-commit dd8dccbf54c176cccd5dc199e89ab30df5fd5d70
+commit 3f79f91eab4135ae781c8c27c52e77a1ddc934c5
 Author: dann frazier <dannf at hp.com>
-Date:   Mon Feb 15 21:33:14 2010 -0700
+Date:   Fri Feb 19 15:14:53 2010 -0700
 
     [Adjusted to apply to Debian's 2.6.18]
     commit e09c72e130336696c983ab00e042b21abfc27d75
@@ -10,7 +10,7 @@
         connector: Delete buggy notification code.
 
 diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
-index b49bacf..fb678da 100644
+index b49bacf..a2ca719 100644
 --- a/drivers/connector/connector.c
 +++ b/drivers/connector/connector.c
 @@ -34,17 +34,6 @@ MODULE_LICENSE("GPL");
@@ -95,14 +95,14 @@
  	return 0;
  }
  EXPORT_SYMBOL_GPL(cn_add_callback);
-@@ -335,120 +274,13 @@ void cn_del_callback(struct cb_id *id)
+@@ -335,120 +274,14 @@ void cn_del_callback(struct cb_id *id)
  	struct cn_dev *dev = &cdev;
  
  	cn_queue_del_callback(dev->cbdev, id);
 -	cn_notify(id, 1);
--}
--EXPORT_SYMBOL_GPL(cn_del_callback);
--
+ }
+ EXPORT_SYMBOL_GPL(cn_del_callback);
+ 
 -/*
 - * Checks two connector's control messages to be the same.
 - * Returns 1 if they are the same or if the first one is corrupted.
@@ -203,8 +203,8 @@
 -	mutex_lock(&notify_lock);
 -	list_add(&ent->notify_entry, &notify_list);
 -	mutex_unlock(&notify_lock);
- }
- 
+-}
+-
  static int __devinit cn_init(void)
  {
  	struct cn_dev *dev = &cdev;
@@ -216,7 +216,7 @@
  
  	dev->nls = netlink_kernel_create(NETLINK_CONNECTOR,
  					 CN_NETLINK_USERS + 0xf,
-@@ -465,15 +297,6 @@ static int __devinit cn_init(void)
+@@ -465,15 +298,6 @@ static int __devinit cn_init(void)
  	
  	cn_already_initialized = 1;
  
@@ -232,7 +232,7 @@
  	return 0;
  }
  
-@@ -483,7 +306,6 @@ static void __devexit cn_fini(void)
+@@ -483,7 +307,6 @@ static void __devexit cn_fini(void)
  
  	cn_already_initialized = 0;