diff --git a/debian/changelog b/debian/changelog index 0fe23f5e5..2c0b910b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.25~rc1-1~experimental.1) UNRELEASED; urgency=low +linux-2.6 (2.6.25~rc2-1~experimental.1) UNRELEASED; urgency=low * New upstream release (closes: #456799) diff --git a/debian/patches/bugfix/sata_mv-dma.patch b/debian/patches/bugfix/sata_mv-dma.patch deleted file mode 100644 index 0cd0ec585..000000000 --- a/debian/patches/bugfix/sata_mv-dma.patch +++ /dev/null @@ -1,89 +0,0 @@ -will be in rc2 - - - - -From: Byron Bradley -Date: Fri, 8 Feb 2008 01:33:12 +0000 (+0000) -Subject: sata_mv: platform driver allocs dma without create -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=86566e6e2940177f665d07cb9276ed751ad90e7e - -sata_mv: platform driver allocs dma without create - -When the sata_mv driver is used as a platform driver, -mv_create_dma_pools() is never called so it fails when trying -to alloc in mv_pool_start(). - -Signed-off-by: Byron Bradley -Signed-off-by: Mark Lord ---- - -diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c -index 080b836..8b79f1e 100644 ---- a/drivers/ata/sata_mv.c -+++ b/drivers/ata/sata_mv.c -@@ -2879,6 +2879,26 @@ done: - return rc; - } - -+static int mv_create_dma_pools(struct mv_host_priv *hpriv, struct device *dev) -+{ -+ hpriv->crqb_pool = dmam_pool_create("crqb_q", dev, MV_CRQB_Q_SZ, -+ MV_CRQB_Q_SZ, 0); -+ if (!hpriv->crqb_pool) -+ return -ENOMEM; -+ -+ hpriv->crpb_pool = dmam_pool_create("crpb_q", dev, MV_CRPB_Q_SZ, -+ MV_CRPB_Q_SZ, 0); -+ if (!hpriv->crpb_pool) -+ return -ENOMEM; -+ -+ hpriv->sg_tbl_pool = dmam_pool_create("sg_tbl", dev, MV_SG_TBL_SZ, -+ MV_SG_TBL_SZ, 0); -+ if (!hpriv->sg_tbl_pool) -+ return -ENOMEM; -+ -+ return 0; -+} -+ - /** - * mv_platform_probe - handle a positive probe of an soc Marvell - * host -@@ -2932,6 +2952,10 @@ static int mv_platform_probe(struct platform_device *pdev) - hpriv->base = ioremap(res->start, res->end - res->start + 1); - hpriv->base -= MV_SATAHC0_REG_BASE; - -+ rc = mv_create_dma_pools(hpriv, &pdev->dev); -+ if (rc) -+ return rc; -+ - /* initialize adapter */ - rc = mv_init_host(host, chip_soc); - if (rc) -@@ -3068,26 +3092,6 @@ static void mv_print_info(struct ata_host *host) - scc_s, (MV_HP_FLAG_MSI & hpriv->hp_flags) ? "MSI" : "INTx"); - } - --static int mv_create_dma_pools(struct mv_host_priv *hpriv, struct device *dev) --{ -- hpriv->crqb_pool = dmam_pool_create("crqb_q", dev, MV_CRQB_Q_SZ, -- MV_CRQB_Q_SZ, 0); -- if (!hpriv->crqb_pool) -- return -ENOMEM; -- -- hpriv->crpb_pool = dmam_pool_create("crpb_q", dev, MV_CRPB_Q_SZ, -- MV_CRPB_Q_SZ, 0); -- if (!hpriv->crpb_pool) -- return -ENOMEM; -- -- hpriv->sg_tbl_pool = dmam_pool_create("sg_tbl", dev, MV_SG_TBL_SZ, -- MV_SG_TBL_SZ, 0); -- if (!hpriv->sg_tbl_pool) -- return -ENOMEM; -- -- return 0; --} -- - /** - * mv_pci_init_one - handle a positive probe of a PCI Marvell host - * @pdev: PCI device found diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index b9090af5e..26d26fec5 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -30,6 +30,5 @@ + bugfix/arm/disable-scsi_acard.patch #+ bugfix/arm/disable-ath5k.patch #the following will be fixed before 2.6.25 is out: -+ bugfix/sata_mv-dma.patch + bugfix/sata_mv-platform_driver.patch + bugfix/arm/ignore-invalid-memtags.patch