lkml.org 
[lkml]   [2006]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH for review] [100/145] x86_64: Fix broken indentation in iommu_setup
    Date
    r

    No functional changes; only white space.

    Signed-off-by: Andi Kleen <ak@suse.de>

    ---
    arch/x86_64/kernel/pci-dma.c | 86 ++++++++++++++++++++-----------------------
    1 files changed, 40 insertions(+), 46 deletions(-)

    Index: linux/arch/x86_64/kernel/pci-dma.c
    ===================================================================
    --- linux.orig/arch/x86_64/kernel/pci-dma.c
    +++ linux/arch/x86_64/kernel/pci-dma.c
    @@ -272,58 +272,52 @@ EXPORT_SYMBOL(dma_set_mask);
    */
    __init int iommu_setup(char *p)
    {
    - iommu_merge = 1;
    -
    + iommu_merge = 1;
    if (!p)
    return -EINVAL;
    -
    - while (*p) {
    - if (!strncmp(p,"off",3))
    - no_iommu = 1;
    - /* gart_parse_options has more force support */
    - if (!strncmp(p,"force",5))
    - force_iommu = 1;
    - if (!strncmp(p,"noforce",7)) {
    - iommu_merge = 0;
    - force_iommu = 0;
    - }
    -
    - if (!strncmp(p, "biomerge",8)) {
    - iommu_bio_merge = 4096;
    - iommu_merge = 1;
    - force_iommu = 1;
    - }
    - if (!strncmp(p, "panic",5))
    - panic_on_overflow = 1;
    - if (!strncmp(p, "nopanic",7))
    - panic_on_overflow = 0;
    - if (!strncmp(p, "merge",5)) {
    - iommu_merge = 1;
    - force_iommu = 1;
    - }
    - if (!strncmp(p, "nomerge",7))
    - iommu_merge = 0;
    - if (!strncmp(p, "forcesac",8))
    - iommu_sac_force = 1;
    - if (!strncmp(p, "allowdac", 8))
    - allow_dac = 1;
    - if (!strncmp(p, "nodac", 5))
    - allow_dac = -1;
    -
    + while (*p) {
    + if (!strncmp(p,"off",3))
    + no_iommu = 1;
    + /* gart_parse_options has more force support */
    + if (!strncmp(p,"force",5))
    + force_iommu = 1;
    + if (!strncmp(p,"noforce",7)) {
    + iommu_merge = 0;
    + force_iommu = 0;
    + }
    + if (!strncmp(p, "biomerge",8)) {
    + iommu_bio_merge = 4096;
    + iommu_merge = 1;
    + force_iommu = 1;
    + }
    + if (!strncmp(p, "panic",5))
    + panic_on_overflow = 1;
    + if (!strncmp(p, "nopanic",7))
    + panic_on_overflow = 0;
    + if (!strncmp(p, "merge",5)) {
    + iommu_merge = 1;
    + force_iommu = 1;
    + }
    + if (!strncmp(p, "nomerge",7))
    + iommu_merge = 0;
    + if (!strncmp(p, "forcesac",8))
    + iommu_sac_force = 1;
    + if (!strncmp(p, "allowdac", 8))
    + allow_dac = 1;
    + if (!strncmp(p, "nodac", 5))
    + allow_dac = -1;
    #ifdef CONFIG_SWIOTLB
    - if (!strncmp(p, "soft",4))
    - swiotlb = 1;
    + if (!strncmp(p, "soft",4))
    + swiotlb = 1;
    #endif
    -
    #ifdef CONFIG_IOMMU
    - gart_parse_options(p);
    + gart_parse_options(p);
    #endif
    -
    - p += strcspn(p, ",");
    - if (*p == ',')
    - ++p;
    - }
    - return 0;
    + p += strcspn(p, ",");
    + if (*p == ',')
    + ++p;
    + }
    + return 0;
    }
    early_param("iommu", iommu_setup);

    -
    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: 2006-08-10 22:03    [W:0.056 / U:29.424 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site