lkml.org 
[lkml]   [2008]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH 15/20] x86: move dma_supported and dma_set_mask to pci-dma_32.c
    From
    Date
    On Tue, 2008-03-25 at 18:36 -0300, Glauber Costa wrote:
    > This is the way x86_64 does, so this make them equal. They have
    > to be extern now in the header, and the extern definition is moved to
    > the common dma-mapping.h header
    >
    > Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ...
    > diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c
    > index 5133032..453b4bd 100644
    > --- a/arch/x86/kernel/pci-dma_32.c
    > +++ b/arch/x86/kernel/pci-dma_32.c
    > @@ -156,6 +156,39 @@ EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
    > int forbid_dac;
    > EXPORT_SYMBOL(forbid_dac);
    >
    > +int
    > +dma_supported(struct device *dev, u64 mask)
    > +{
    ...
    > +}
    > +
    > +int
    > +dma_set_mask(struct device *dev, u64 mask)
    > +{
    ...
    > +}
    ...
    > diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h
    > index e60c30a..fd7246d 100644
    > --- a/include/asm-x86/dma-mapping_32.h
    > +++ b/include/asm-x86/dma-mapping_32.h
    > @@ -17,35 +17,6 @@ dma_mapping_error(dma_addr_t dma_addr)
    > extern int forbid_dac;
    >
    > static inline int
    > -dma_supported(struct device *dev, u64 mask)
    > -{
    ...
    > -}
    > -
    > -static inline int
    > -dma_set_mask(struct device *dev, u64 mask)
    > -{
    ...
    > -}

    This breaks for me with:

    ERROR: "dma_supported" [drivers/ssb/ssb.ko] undefined!
    ERROR: "dma_set_mask" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
    ERROR: "dma_set_mask" [drivers/scsi/aic7xxx/aic7xxx.ko] undefined!
    ERROR: "dma_set_mask" [drivers/scsi/aic7xxx/aic79xx.ko] undefined!
    ERROR: "dma_supported" [drivers/net/pcnet32.ko] undefined!
    ERROR: "dma_supported" [drivers/media/video/saa7134/saa7134.ko] undefined!
    ERROR: "dma_set_mask" [drivers/media/video/meye.ko] undefined!
    ERROR: "dma_supported" [drivers/media/video/cx88/cx8802.ko] undefined!
    ERROR: "dma_supported" [drivers/media/video/cx88/cx8800.ko] undefined!
    ERROR: "dma_supported" [drivers/media/video/cx88/cx88-alsa.ko] undefined!
    ERROR: "dma_supported" [drivers/media/video/cx23885/cx23885.ko] undefined!

    They just need to be exported like on x86_64.

    Cheers,
    Mark.

    Subject: [PATCH] x86: export dma_supported() and dma_set_mask() on i386

    dma_supported() and dma_set_mask() were previously inlined,
    but are now moved to pci-dma_32.c.

    Since they're used by various drivers, they need to be
    exported.

    Signed-off-by: Mark McLoughlin <markmc@redhat.com>
    ---
    arch/x86/kernel/pci-dma_32.c | 2 ++
    1 files changed, 2 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c
    index 55ab3c8..be6b1f6 100644
    --- a/arch/x86/kernel/pci-dma_32.c
    +++ b/arch/x86/kernel/pci-dma_32.c
    @@ -180,6 +180,7 @@ dma_supported(struct device *dev, u64 mask)

    return 1;
    }
    +EXPORT_SYMBOL(dma_supported);

    int
    dma_set_mask(struct device *dev, u64 mask)
    @@ -191,6 +192,7 @@ dma_set_mask(struct device *dev, u64 mask)

    return 0;
    }
    +EXPORT_SYMBOL(dma_set_mask);


    static __devinit void via_no_dac(struct pci_dev *dev)


    \
     
     \ /
      Last update: 2008-03-27 12:07    [W:0.049 / U:59.312 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site