rebase to 3.0 final.
This commit is contained in:
Dave Jones
parent
ae5185a30d
commit
95e03a67ce
|
|
@ -453,6 +453,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
|
|||
CONFIG_SCSI_SRP=m
|
||||
CONFIG_SCSI_SRP_ATTRS=m
|
||||
CONFIG_SCSI_TGT=m
|
||||
CONFIG_SCSI_ISCI=m
|
||||
|
||||
CONFIG_SCSI_DH=y
|
||||
CONFIG_SCSI_DH_RDAC=m
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
|
||||
index 686e176..11da90a 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
|
||||
@@ -126,7 +126,7 @@ static inline u8 iwl_tfd_get_num_tbs(struct iwl_tfd *tfd)
|
||||
}
|
||||
|
||||
static void iwlagn_unmap_tfd(struct iwl_priv *priv, struct iwl_cmd_meta *meta,
|
||||
- struct iwl_tfd *tfd)
|
||||
+ struct iwl_tfd *tfd, enum dma_data_direction dma_dir)
|
||||
{
|
||||
struct pci_dev *dev = priv->pci_dev;
|
||||
int i;
|
||||
@@ -151,7 +151,7 @@ static void iwlagn_unmap_tfd(struct iwl_priv *priv, struct iwl_cmd_meta *meta,
|
||||
/* Unmap chunks, if any. */
|
||||
for (i = 1; i < num_tbs; i++)
|
||||
pci_unmap_single(dev, iwl_tfd_tb_get_addr(tfd, i),
|
||||
- iwl_tfd_tb_get_len(tfd, i), PCI_DMA_TODEVICE);
|
||||
+ iwl_tfd_tb_get_len(tfd, i), dma_dir);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -167,7 +167,8 @@ void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
|
||||
struct iwl_tfd *tfd_tmp = txq->tfds;
|
||||
int index = txq->q.read_ptr;
|
||||
|
||||
- iwlagn_unmap_tfd(priv, &txq->meta[index], &tfd_tmp[index]);
|
||||
+ iwlagn_unmap_tfd(priv, &txq->meta[index], &tfd_tmp[index],
|
||||
+ PCI_DMA_TODEVICE);
|
||||
|
||||
/* free SKB */
|
||||
if (txq->txb) {
|
||||
@@ -700,10 +701,11 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
||||
if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))
|
||||
continue;
|
||||
phys_addr = pci_map_single(priv->pci_dev, (void *)cmd->data[i],
|
||||
- cmd->len[i], PCI_DMA_TODEVICE);
|
||||
+ cmd->len[i], PCI_DMA_BIDIRECTIONAL);
|
||||
if (pci_dma_mapping_error(priv->pci_dev, phys_addr)) {
|
||||
iwlagn_unmap_tfd(priv, out_meta,
|
||||
- &txq->tfds[q->write_ptr]);
|
||||
+ &txq->tfds[q->write_ptr],
|
||||
+ PCI_DMA_BIDIRECTIONAL);
|
||||
idx = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
@@ -807,7 +809,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
|
||||
cmd = txq->cmd[cmd_index];
|
||||
meta = &txq->meta[cmd_index];
|
||||
|
||||
- iwlagn_unmap_tfd(priv, meta, &txq->tfds[index]);
|
||||
+ iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], PCI_DMA_BIDIRECTIONAL);
|
||||
|
||||
/* Input error checking is done when commands are added to queue. */
|
||||
if (meta->flags & CMD_WANT_SKB) {
|
||||
26
kernel.spec
26
kernel.spec
|
|
@ -6,7 +6,7 @@ Summary: The Linux kernel
|
|||
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
||||
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
||||
# be 0.
|
||||
%global released_kernel 0
|
||||
%global released_kernel 1
|
||||
|
||||
# Save original buildid for later if it's defined
|
||||
%if 0%{?buildid:1}
|
||||
|
|
@ -51,13 +51,14 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be prepended with "0.", so
|
||||
# for example a 3 here will become 0.3
|
||||
#
|
||||
%global baserelease 1
|
||||
%global baserelease 0
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
# on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
|
||||
# which yields a base_sublevel of 21.
|
||||
%define base_sublevel 39
|
||||
%define fake_sublevel 40
|
||||
|
||||
## If this is a released kernel ##
|
||||
%if 0%{?released_kernel}
|
||||
|
|
@ -75,19 +76,8 @@ Summary: The Linux kernel
|
|||
%define stable_base %(echo $((%{stable_update} - 1)))
|
||||
%endif
|
||||
%endif
|
||||
%define rpmversion 2.6.%{base_sublevel}%{?stablerev}
|
||||
%define rpmversion 2.6.%{fake_sublevel}%{?stablerev}
|
||||
|
||||
## The not-released-kernel case ##
|
||||
%else
|
||||
# The next upstream release sublevel (base_sublevel+1)
|
||||
# % define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
%define upstream_sublevel 40
|
||||
# The rc snapshot level
|
||||
%define rcrev 5
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 2.6.%{upstream_sublevel}
|
||||
%endif
|
||||
# Nb: The above rcrev and gitrev values automagically define Patch00 and Patch01 below.
|
||||
|
||||
|
|
@ -690,7 +680,6 @@ Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
|
|||
Patch12205: runtime_pm_fixups.patch
|
||||
|
||||
Patch12303: dmar-disable-when-ricoh-multifunction.patch
|
||||
Patch12304: iwlagn-fix-dma-direction.patch
|
||||
|
||||
%endif
|
||||
|
||||
|
|
@ -1115,6 +1104,9 @@ do
|
|||
done
|
||||
%endif
|
||||
|
||||
# Update vanilla to the latest upstream. (2.6.39 -> 3.0)
|
||||
ApplyPatch patch-3.0.bz2
|
||||
|
||||
ApplyOptionalPatch git-linus.diff
|
||||
|
||||
ApplyPatch linux-2.6-makefile-after_link.patch
|
||||
|
|
@ -1265,7 +1257,6 @@ ApplyPatch neuter_intel_microcode_load.patch
|
|||
|
||||
# rhbz#605888
|
||||
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
|
||||
ApplyPatch iwlagn-fix-dma-direction.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
|
|
@ -1879,6 +1870,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Tue Jul 26 2011 Dave Jones <davej@redhat.com> 2.6.40-0
|
||||
- Rebase to final 3.0 (munge to 2.6.40-0)
|
||||
|
||||
* Thu Jun 30 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.40-0.rc5.git0.1
|
||||
- More than meets the eye, it's Linux 3.0-rc5 in disguise.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue