diff options
-rw-r--r-- | arch/x86/ia32/ia32_aout.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index f1a0f83676dc..e4c12079171b 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/binfmts.h> | 25 | #include <linux/binfmts.h> |
26 | #include <linux/personality.h> | 26 | #include <linux/personality.h> |
27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/jiffies.h> | ||
28 | 29 | ||
29 | #include <asm/system.h> | 30 | #include <asm/system.h> |
30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
@@ -359,13 +360,14 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
359 | #ifdef WARN_OLD | 360 | #ifdef WARN_OLD |
360 | static unsigned long error_time, error_time2; | 361 | static unsigned long error_time, error_time2; |
361 | if ((ex.a_text & 0xfff || ex.a_data & 0xfff) && | 362 | if ((ex.a_text & 0xfff || ex.a_data & 0xfff) && |
362 | (N_MAGIC(ex) != NMAGIC) && (jiffies-error_time2) > 5*HZ) { | 363 | (N_MAGIC(ex) != NMAGIC) && |
364 | time_after(jiffies, error_time2 + 5*HZ)) { | ||
363 | printk(KERN_NOTICE "executable not page aligned\n"); | 365 | printk(KERN_NOTICE "executable not page aligned\n"); |
364 | error_time2 = jiffies; | 366 | error_time2 = jiffies; |
365 | } | 367 | } |
366 | 368 | ||
367 | if ((fd_offset & ~PAGE_MASK) != 0 && | 369 | if ((fd_offset & ~PAGE_MASK) != 0 && |
368 | (jiffies - error_time) > 5*HZ) { | 370 | time_after(jiffies, error_time + 5*HZ)) { |
369 | printk(KERN_WARNING | 371 | printk(KERN_WARNING |
370 | "fd_offset is not page aligned. Please convert " | 372 | "fd_offset is not page aligned. Please convert " |
371 | "program: %s\n", | 373 | "program: %s\n", |
@@ -484,7 +486,7 @@ static int load_aout_library(struct file *file) | |||
484 | 486 | ||
485 | #ifdef WARN_OLD | 487 | #ifdef WARN_OLD |
486 | static unsigned long error_time; | 488 | static unsigned long error_time; |
487 | if ((jiffies-error_time) > 5*HZ) { | 489 | if (time_after(jiffies, error_time + 5*HZ)) { |
488 | printk(KERN_WARNING | 490 | printk(KERN_WARNING |
489 | "N_TXTOFF is not page aligned. Please convert " | 491 | "N_TXTOFF is not page aligned. Please convert " |
490 | "library: %s\n", | 492 | "library: %s\n", |