Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e50b6cc authored by S.Çağlar Onur's avatar S.Çağlar Onur Committed by Linus Torvalds
Browse files

fs/binfmt_aout.c: use printk_ratelimit() 



Use printk_ratelimit() instead of jiffies based arithmetic, suggested by Geert
Uytterhoeven

Signed-off-by: default avatarS.Caglar Onur <caglar@pardus.org.tr>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aab3c3b0

fs/binfmt_aout.c

+3 −9
Original line number Diff line number Diff line
@@ -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);