update to snapshot 3.0-rc6-git6
revert CONFIG_X86_RESERVE_LOW=640, it breaks boot.
This commit is contained in:
Kyle McMartin
parent
75d6a46098
commit
e04b212cc5
|
|
@ -448,7 +448,7 @@ CONFIG_MICROCODE_INTEL=y
|
|||
CONFIG_MICROCODE_AMD=y
|
||||
|
||||
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
|
||||
CONFIG_X86_RESERVE_LOW=640
|
||||
CONFIG_X86_RESERVE_LOW_64K=y
|
||||
|
||||
# CONFIG_CMDLINE_BOOL is not set
|
||||
|
||||
|
|
@ -529,6 +529,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
|
|||
|
||||
CONFIG_EDAC_MCE_INJ=m
|
||||
CONFIG_IRQ_TIME_ACCOUNTING=y
|
||||
CONFIG_X86_RESERVE_LOW=64
|
||||
|
||||
CONFIG_PCH_GBE=m
|
||||
CONFIG_PCH_PHUB=m
|
||||
|
|
|
|||
|
|
@ -366,7 +366,7 @@ CONFIG_MICROCODE_INTEL=y
|
|||
CONFIG_MICROCODE_AMD=y
|
||||
|
||||
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
|
||||
CONFIG_X86_RESERVE_LOW=640
|
||||
CONFIG_X86_RESERVE_LOW_64K=y
|
||||
|
||||
# CONFIG_CMDLINE_BOOL is not set
|
||||
|
||||
|
|
@ -444,6 +444,7 @@ CONFIG_IDEAPAD_LAPTOP=m
|
|||
|
||||
CONFIG_EDAC_MCE_INJ=m
|
||||
CONFIG_IRQ_TIME_ACCOUNTING=y
|
||||
CONFIG_X86_RESERVE_LOW=64
|
||||
|
||||
CONFIG_PCH_GBE=m
|
||||
CONFIG_PCH_PHUB=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) {
|
||||
|
|
@ -85,7 +85,7 @@ Summary: The Linux kernel
|
|||
# The rc snapshot level
|
||||
%define rcrev 6
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
%define gitrev 6
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}
|
||||
%endif
|
||||
|
|
@ -691,7 +691,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
|
||||
|
||||
|
|
@ -1266,7 +1265,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
|
||||
|
||||
|
|
@ -1878,6 +1876,11 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Sun Jul 10 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc6.git6.1
|
||||
- Linux 3.0-rc6-git6
|
||||
- iwlagn-fix-dma-direction.patch: drop.
|
||||
- Revert CONFIG_X86_RESERVE_LOW=640, it breaks booting on x86_64.
|
||||
|
||||
* Thu Jul 07 2011 Dave Jones <davej@redhat.com>
|
||||
- Centralise CPU_FREQ options into config-generic.
|
||||
Switch to using ondemand by default. (rhbz 713572)
|
||||
|
|
|
|||
Loading…
Reference in New Issue