diff options
author | Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de> | 2011-06-04 01:36:54 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-29 01:31:01 -0400 |
commit | 76462232c21dc011462522387ddad0598a4f11e4 (patch) | |
tree | a21be7280dd159e44f5a9a387c586a059a84485b /arch/powerpc/mm | |
parent | 9a8f99fab02db296815d7f0ae8ba8ce169df0063 (diff) |
arch/powerpc: use printk_ratelimited instead of printk_ratelimit
Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited.
Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/fault.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 54f4fb994e99..ad35f66c69e8 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/kdebug.h> | 31 | #include <linux/kdebug.h> |
32 | #include <linux/perf_event.h> | 32 | #include <linux/perf_event.h> |
33 | #include <linux/magic.h> | 33 | #include <linux/magic.h> |
34 | #include <linux/ratelimit.h> | ||
34 | 35 | ||
35 | #include <asm/firmware.h> | 36 | #include <asm/firmware.h> |
36 | #include <asm/page.h> | 37 | #include <asm/page.h> |
@@ -346,11 +347,10 @@ bad_area_nosemaphore: | |||
346 | return 0; | 347 | return 0; |
347 | } | 348 | } |
348 | 349 | ||
349 | if (is_exec && (error_code & DSISR_PROTFAULT) | 350 | if (is_exec && (error_code & DSISR_PROTFAULT)) |
350 | && printk_ratelimit()) | 351 | printk_ratelimited(KERN_CRIT "kernel tried to execute NX-protected" |
351 | printk(KERN_CRIT "kernel tried to execute NX-protected" | 352 | " page (%lx) - exploit attempt? (uid: %d)\n", |
352 | " page (%lx) - exploit attempt? (uid: %d)\n", | 353 | address, current_uid()); |
353 | address, current_uid()); | ||
354 | 354 | ||
355 | return SIGSEGV; | 355 | return SIGSEGV; |
356 | 356 | ||