lkml.org 
[lkml]   [2004]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ppc32: reorg DMA API, add coherent alloc in irq
On Sun, May 30, 2004 at 11:29:06AM -0700, Eugene Surovegin wrote:
> On Sun, May 30, 2004 at 02:28:35PM +0200, Arjan van de Ven wrote:
> > On Sat, 2004-05-29 at 19:56, Linux Kernel Mailing List wrote:
> > > ChangeSet 1.1770, 2004/05/29 10:56:14-07:00, akpm@osdl.org
> > >
> > > [PATCH] ppc32: reorg DMA API, add coherent alloc in irq
> > >
> > > From: Matt Porter <mporter@kernel.crashing.org>
> >
> > this breaks the acenic driver:
> >
> > In file included from drivers/net/acenic.c:186:
> > drivers/net/acenic.h:598: error: syntax error before
> > "DECLARE_PCI_UNMAP_ADDR"
>
> [snip]
>
> This patch should help.
>
> PPC32: Put back DECLARE_PCI_UNMAP_??? and friends accidentaly removed during DMA
> API reorganization.
>
> Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
>
> ===== include/asm-ppc/pci.h 1.28 vs edited =====
> --- 1.28/include/asm-ppc/pci.h Sat May 29 00:26:35 2004
> +++ edited/include/asm-ppc/pci.h Sun May 30 11:03:59 2004
> @@ -61,6 +61,14 @@
> */
> #define PCI_DMA_BUS_IS_PHYS (1)
>
> +/* pci_unmap_{page,single} is a nop so... */
> +#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
> +#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
> +#define pci_unmap_addr(PTR, ADDR_NAME) (0)
> +#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
> +#define pci_unmap_len(PTR, LEN_NAME) (0)
> +#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
> +
> /*
> * At present there are very few 32-bit PPC machines that can have
> * memory above the 4GB point, and we don't support that.

Yes, thanks. This is much better after I obviously fat-fingered those
calls away. acenic builds here again.

Andrew/Linus, please apply Eugene's patch to fix my breakage. ;)

-Matt
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:03    [W:0.019 / U:0.552 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site