rpms/kernel/devel patch-2.6.27-rc5-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.914, 1.915 kernel.spec, 1.926, 1.927 linux-2.6-iwlwifi-use-dma_alloc_coherent.patch, 1.2, 1.3 sources, 1.877, 1.878 upstream, 1.790, 1.791 linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch, 1.1, NONE patch-2.6.27-rc5-git5.bz2.sign, 1.1, NONE

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15925

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-iwlwifi-use-dma_alloc_coherent.patch sources 
	upstream 
Added Files:
	patch-2.6.27-rc5-git6.bz2.sign 
Removed Files:
	linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch 
	patch-2.6.27-rc5-git5.bz2.sign 
Log Message:
2.6.27-rc6-git6. Hopefully it'll fix #460723


--- NEW FILE patch-2.6.27-rc5-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIv854yGugalF9Dw4RAgHKAJ9XWUGo65jMZz29Zx7wIuRw7Tj6gQCggwWb
4eE2b3zjXYzXSFKxea5pA80=
=GK12
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -r1.914 -r1.915
--- .cvsignore	4 Sep 2008 03:11:16 -0000	1.914
+++ .cvsignore	4 Sep 2008 21:45:56 -0000	1.915
@@ -5,4 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git5.bz2
+patch-2.6.27-rc5-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- kernel.spec	4 Sep 2008 04:05:24 -0000	1.926
+++ kernel.spec	4 Sep 2008 21:45:56 -0000	1.927
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -642,9 +642,6 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
-# fix selinux memory leak, patch headed upstream
-Patch3000:  linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1179,7 +1176,6 @@
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
-ApplyPatch  linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1753,6 +1749,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep  4 2008 David Woodhouse <David.Woodhouse at intel.com>
+- 2.6.27-rc5-git6
+
 * Wed Sep  3 2008 Roland McGrath <roland at redhat.com>
 - utrace update
 

linux-2.6-iwlwifi-use-dma_alloc_coherent.patch:

Index: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-iwlwifi-use-dma_alloc_coherent.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-iwlwifi-use-dma_alloc_coherent.patch	4 Sep 2008 03:11:17 -0000	1.2
+++ linux-2.6-iwlwifi-use-dma_alloc_coherent.patch	4 Sep 2008 21:45:56 -0000	1.3
@@ -1,7 +1,7 @@
-Index: linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/wireless/iwlwifi/iwl-dev.h
-+++ linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-dev.h
+diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
+index cdfb343..821feed 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
++++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
 @@ -135,6 +135,7 @@ struct iwl_tx_info {
  struct iwl_tx_queue {
  	struct iwl_queue q;
@@ -10,11 +10,11 @@
  	struct iwl_cmd *cmd[TFD_TX_CMD_SLOTS];
  	struct iwl_tx_info *txb;
  	int need_update;
-Index: linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/wireless/iwlwifi/iwl-tx.c
-+++ linux-2.6.26.noarch/drivers/net/wireless/iwlwifi/iwl-tx.c
-@@ -212,7 +212,7 @@ static void iwl_tx_queue_free(struct iwl
+diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
+index 78b1a7a..e131707 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
+@@ -212,7 +212,7 @@ static void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id)
  {
  	struct iwl_tx_queue *txq = &priv->txq[txq_id];
  	struct iwl_queue *q = &txq->q;
@@ -23,7 +23,7 @@
  	int i, slots_num, len;
  
  	if (q->n_bd == 0)
-@@ -223,22 +223,22 @@ static void iwl_tx_queue_free(struct iwl
+@@ -223,22 +223,22 @@ static void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id)
  	     q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd))
  		iwl_hw_txq_free_tfd(priv, txq);
  
@@ -54,15 +54,15 @@
  
  	/* De-alloc array of per-TFD driver data */
  	kfree(txq->txb);
-@@ -406,6 +406,7 @@ static int iwl_tx_queue_init(struct iwl_
- 			     struct iwl_tx_queue *txq,
+@@ -405,6 +405,7 @@ static int iwl_hw_tx_queue_init(struct iwl_priv *priv,
+ static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  			     int slots_num, u32 txq_id)
  {
 +	struct device *dev = &priv->pci_dev->dev;
  	int i, len;
- 	int rc = 0;
+ 	int ret;
  
-@@ -426,16 +427,27 @@ static int iwl_tx_queue_init(struct iwl_
+@@ -425,9 +426,15 @@ static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  				continue;
  		}
  
@@ -74,26 +74,33 @@
 +			len = sizeof(struct iwl_cmd);
 +			for (--i; i >= 0; --i)
 +				dma_free_coherent(dev, len, txq->cmd[i],
-+					txq->dma_addr_cmd[i]);
- 			return -ENOMEM;
++						  txq->dma_addr_cmd[i]);
+ 			goto err;
 +		}
  	}
  
  	/* Alloc driver data array and TFD circular buffer */
- 	rc = iwl_tx_queue_alloc(priv, txq, txq_id);
- 	if (rc) {
-+		len = sizeof(struct iwl_cmd);
- 		for (i = 0; i < slots_num; i++)
--			kfree(txq->cmd[i]);
-+			dma_free_coherent(dev, len, txq->cmd[i],
-+				txq->dma_addr_cmd[i]);
-+		if (txq_id == IWL_CMD_QUEUE_NUM)
-+			dma_free_coherent(dev, len + IWL_MAX_SCAN_SIZE,
-+				txq->cmd[i], txq->dma_addr_cmd[i]);
+@@ -449,13 +456,17 @@ static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  
- 		return -ENOMEM;
+ 	return 0;
+ err:
++	len = sizeof(struct iwl_cmd);
+ 	for (i = 0; i < slots_num; i++) {
+-		kfree(txq->cmd[i]);
++		dma_free_coherent(dev, len, txq->cmd[i],
++				  txq->dma_addr_cmd[i]);
+ 		txq->cmd[i] = NULL;
+ 	}
+ 
+ 	if (txq_id == IWL_CMD_QUEUE_NUM) {
+-		kfree(txq->cmd[slots_num]);
++		dma_free_coherent(dev, len + IWL_MAX_SCAN_SIZE,
++				  txq->cmd[slots_num],
++				  txq->dma_addr_cmd[slots_num]);
+ 		txq->cmd[slots_num] = NULL;
  	}
-@@ -911,9 +923,7 @@ int iwl_tx_skb(struct iwl_priv *priv, st
+ 	return -ENOMEM;
+@@ -918,9 +929,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
  
  	/* Physical address of this Tx command's header (not MAC header!),
  	 * within command buffer array. */
@@ -104,7 +111,7 @@
  
  	/* Add buffer containing Tx command and MAC(!) header to TFD's
  	 * first entry */
-@@ -1060,9 +1070,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *pr
+@@ -1067,9 +1076,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
  		out_cmd->hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME);
  	len = (idx == TFD_CMD_SLOTS) ?
  			IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd);
@@ -115,7 +122,7 @@
  	iwl_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, fix_size);
  
  	IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "
-@@ -1127,9 +1135,6 @@ static void iwl_hcmd_queue_reclaim(struc
+@@ -1134,9 +1141,6 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
  {
  	struct iwl_tx_queue *txq = &priv->txq[txq_id];
  	struct iwl_queue *q = &txq->q;
@@ -125,7 +132,7 @@
  	int nfreed = 0;
  
  	if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {
-@@ -1147,19 +1152,7 @@ static void iwl_hcmd_queue_reclaim(struc
+@@ -1154,19 +1158,7 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
  					q->write_ptr, q->read_ptr);
  			queue_work(priv->workqueue, &priv->restart);
  		}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -r1.877 -r1.878
--- sources	4 Sep 2008 03:11:17 -0000	1.877
+++ sources	4 Sep 2008 21:45:56 -0000	1.878
@@ -1,3 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 d91adda8bcf04852048b8eab06eeae3d  patch-2.6.27-rc5.bz2
-158f207e6cbc26ed8a5dc601c4f1883f  patch-2.6.27-rc5-git5.bz2
+142aff1bfc8973698ca1a043c0aca51d  patch-2.6.27-rc5-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- upstream	4 Sep 2008 03:11:17 -0000	1.790
+++ upstream	4 Sep 2008 21:45:56 -0000	1.791
@@ -1,3 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.27-rc5.bz2
-patch-2.6.27-rc5-git5.bz2
+patch-2.6.27-rc5-git6.bz2


--- linux-2.6-selinux-memory-leak-in-security-context-to-sid-core.patch DELETED ---


--- patch-2.6.27-rc5-git5.bz2.sign DELETED ---