lkml.org 
[lkml]   [2008]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] fs/binfmt_aout.c: Use printk_ratelimit()
    Date
    Use printk_ratelimit() instead of jiffies based arithmetic, suggested by Geert Uytterhoeven

    Cc: linux-arch@vger.kernel.org
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    ---
    fs/binfmt_aout.c | 12 +++---------
    1 files changed, 3 insertions(+), 9 deletions(-)

    diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
    index a1bb224..ba4cddb 100644
    --- a/fs/binfmt_aout.c
    +++ b/fs/binfmt_aout.c
    @@ -372,21 +372,17 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)

    flush_icache_range(text_addr, text_addr+ex.a_text+ex.a_data);
    } else {
    - static unsigned long error_time, error_time2;
    if ((ex.a_text & 0xfff || ex.a_data & 0xfff) &&
    - (N_MAGIC(ex) != NMAGIC) && (jiffies-error_time2) > 5*HZ)
    + (N_MAGIC(ex) != NMAGIC) && printk_ratelimit())
    {
    printk(KERN_NOTICE "executable not page aligned\n");
    - error_time2 = jiffies;
    }

    - if ((fd_offset & ~PAGE_MASK) != 0 &&
    - (jiffies-error_time) > 5*HZ)
    + if ((fd_offset & ~PAGE_MASK) != 0 && printk_ratelimit())
    {
    printk(KERN_WARNING
    "fd_offset is not page aligned. Please convert program: %s\n",
    bprm->file->f_path.dentry->d_name.name);
    - error_time = jiffies;
    }

    if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
    @@ -495,15 +491,13 @@ static int load_aout_library(struct file *file)
    start_addr = ex.a_entry & 0xfffff000;

    if ((N_TXTOFF(ex) & ~PAGE_MASK) != 0) {
    - static unsigned long error_time;
    loff_t pos = N_TXTOFF(ex);

    - if ((jiffies-error_time) > 5*HZ)
    + if (printk_ratelimit())
    {
    printk(KERN_WARNING
    "N_TXTOFF is not page aligned. Please convert library: %s\n",
    file->f_path.dentry->d_name.name);
    - error_time = jiffies;
    }
    down_write(&current->mm->mmap_sem);
    do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
    --
    1.5.4.3
    --
    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: 2008-03-17 10:43    [W:0.022 / U:90.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site