lkml.org 
[lkml]   [2007]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[git patches] two warning fixes

    Please pull from 'warnings' branch of
    master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git warnings

    to receive the following updates:

    drivers/video/aty/radeon_base.c | 23 ++++++++++++++++++-----
    include/asm-x86_64/tlbflush.h | 6 +++++-
    2 files changed, 23 insertions(+), 6 deletions(-)

    Jeff Garzik (2):
    drivers/video/aty/radeon_base: fix radeonfb_pci_register() err handling
    [X86-64] make flush_tlb_kernel_range() a static inline function

    diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
    index 47ca62f..5a5458b 100644
    --- a/drivers/video/aty/radeon_base.c
    +++ b/drivers/video/aty/radeon_base.c
    @@ -2326,10 +2326,16 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
    radeon_check_modes(rinfo, mode_option);

    /* Register some sysfs stuff (should be done better) */
    - if (rinfo->mon1_EDID)
    - sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid1_attr);
    - if (rinfo->mon2_EDID)
    - sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid2_attr);
    + if (rinfo->mon1_EDID) {
    + ret = sysfs_create_bin_file(&rinfo->pdev->dev.kobj,&edid1_attr);
    + if (ret)
    + goto err_unmap_fb;
    + }
    + if (rinfo->mon2_EDID) {
    + ret = sysfs_create_bin_file(&rinfo->pdev->dev.kobj,&edid2_attr);
    + if (ret)
    + goto err_free_mon1;
    + }

    /* save current mode regs before we switch into the new one
    * so we can restore this upon __exit
    @@ -2353,7 +2359,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
    if (ret < 0) {
    printk (KERN_ERR "radeonfb (%s): could not register framebuffer\n",
    pci_name(rinfo->pdev));
    - goto err_unmap_fb;
    + goto err_free_mon2;
    }

    #ifdef CONFIG_MTRR
    @@ -2372,6 +2378,13 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
    RTRACE("radeonfb_pci_register END\n");

    return 0;
    +
    +err_free_mon2:
    + if (rinfo->mon2_EDID)
    + sysfs_remove_bin_file(&rinfo->pdev->dev.kobj, &edid2_attr);
    +err_free_mon1:
    + if (rinfo->mon1_EDID)
    + sysfs_remove_bin_file(&rinfo->pdev->dev.kobj, &edid1_attr);
    err_unmap_fb:
    iounmap(rinfo->fb_base);
    err_unmap_rom:
    diff --git a/include/asm-x86_64/tlbflush.h b/include/asm-x86_64/tlbflush.h
    index 8516225..a82464c 100644
    --- a/include/asm-x86_64/tlbflush.h
    +++ b/include/asm-x86_64/tlbflush.h
    @@ -92,7 +92,11 @@ static inline void flush_tlb_range(struct vm_area_struct * vma, unsigned long st

    #endif

    -#define flush_tlb_kernel_range(start, end) flush_tlb_all()
    +static inline void flush_tlb_kernel_range(unsigned long start,
    + unsigned long end)
    +{
    + flush_tlb_all();
    +}

    static inline void flush_tlb_pgtables(struct mm_struct *mm,
    unsigned long start, unsigned long end)
    -
    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: 2007-07-19 02:09    [W:0.023 / U:33.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site