diff options
| author | Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de> | 2011-06-04 05:36:54 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-29 15:31:01 +1000 |
| commit | 76462232c21dc011462522387ddad0598a4f11e4 (patch) | |
| tree | a21be7280dd159e44f5a9a387c586a059a84485b /arch/powerpc/mm | |
| parent | 9a8f99fab02db296815d7f0ae8ba8ce169df0063 (diff) | |
| download | kernel_samsung_smdk4412-76462232c21dc011462522387ddad0598a4f11e4.tar.gz kernel_samsung_smdk4412-76462232c21dc011462522387ddad0598a4f11e4.tar.bz2 kernel_samsung_smdk4412-76462232c21dc011462522387ddad0598a4f11e4.zip | |
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 54f4fb994e9..ad35f66c69e 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -31,6 +31,7 @@ #include <linux/kdebug.h> #include <linux/perf_event.h> #include <linux/magic.h> +#include <linux/ratelimit.h> #include <asm/firmware.h> #include <asm/page.h> @@ -346,11 +347,10 @@ bad_area_nosemaphore: return 0; } - if (is_exec && (error_code & DSISR_PROTFAULT) - && printk_ratelimit()) - printk(KERN_CRIT "kernel tried to execute NX-protected" - " page (%lx) - exploit attempt? (uid: %d)\n", - address, current_uid()); + if (is_exec && (error_code & DSISR_PROTFAULT)) + printk_ratelimited(KERN_CRIT "kernel tried to execute NX-protected" + " page (%lx) - exploit attempt? (uid: %d)\n", + address, current_uid()); return SIGSEGV; |