lkml.org 
[lkml]   [2008]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/28] x86: move definition to pci-dma.c
    Date
    Move dma_ops structure definition to pci-dma.c, where it
    belongs.

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    arch/x86/kernel/pci-base_32.c | 11 ++++++++---
    arch/x86/kernel/pci-dma.c | 3 +++
    arch/x86/mm/init_64.c | 3 ---
    3 files changed, 11 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c
    index 837bbe9..b44ea51 100644
    --- a/arch/x86/kernel/pci-base_32.c
    +++ b/arch/x86/kernel/pci-base_32.c
    @@ -37,7 +37,7 @@ static int pci32_map_error(dma_addr_t dma_addr)
    return 0;
    }

    -static const struct dma_mapping_ops pci32_dma_ops = {
    +const struct dma_mapping_ops pci32_dma_ops = {
    .map_single = pci32_map_single,
    .unmap_single = NULL,
    .map_sg = pci32_dma_map_sg,
    @@ -51,5 +51,10 @@ static const struct dma_mapping_ops pci32_dma_ops = {
    .mapping_error = pci32_map_error,
    };

    -const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;
    -EXPORT_SYMBOL(dma_ops);
    +/* this is temporary */
    +int __init no_iommu_init(void)
    +{
    + dma_ops = &pci32_dma_ops;
    + return 0;
    +}
    +fs_initcall(no_iommu_init);
    diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
    index f1c24d8..1323cd8 100644
    --- a/arch/x86/kernel/pci-dma.c
    +++ b/arch/x86/kernel/pci-dma.c
    @@ -1,5 +1,8 @@
    #include <linux/dma-mapping.h>

    +const struct dma_mapping_ops *dma_ops;
    +EXPORT_SYMBOL(dma_ops);
    +
    int dma_set_mask(struct device *dev, u64 mask)
    {
    if (!dev->dma_mask || !dma_supported(dev, mask))
    diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
    index 8c989b8..f06a51e 100644
    --- a/arch/x86/mm/init_64.c
    +++ b/arch/x86/mm/init_64.c
    @@ -47,9 +47,6 @@
    #include <asm/numa.h>
    #include <asm/cacheflush.h>

    -const struct dma_mapping_ops *dma_ops;
    -EXPORT_SYMBOL(dma_ops);
    -
    static unsigned long dma_reserve __initdata;

    DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-04-08 18:35    [W:0.027 / U:0.588 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site