Skip to content

Commit 9ab3a15

Browse files
committed
sh: use printk_ratelimited instead of printk_ratelimit
Follows the powerpc change, for much the same rationale. Signed-off-by: Paul Mundt <[email protected]>
1 parent 7b61ca5 commit 9ab3a15

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

arch/sh/kernel/irq.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/seq_file.h>
1414
#include <linux/ftrace.h>
1515
#include <linux/delay.h>
16+
#include <linux/ratelimit.h>
1617
#include <asm/processor.h>
1718
#include <asm/machvec.h>
1819
#include <asm/uaccess.h>
@@ -268,9 +269,8 @@ void migrate_irqs(void)
268269
unsigned int newcpu = cpumask_any_and(data->affinity,
269270
cpu_online_mask);
270271
if (newcpu >= nr_cpu_ids) {
271-
if (printk_ratelimit())
272-
printk(KERN_INFO "IRQ%u no longer affine to CPU%u\n",
273-
irq, cpu);
272+
pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
273+
irq, cpu);
274274

275275
cpumask_setall(data->affinity);
276276
newcpu = cpumask_any_and(data->affinity,

arch/sh/mm/alignment.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/seq_file.h>
1414
#include <linux/proc_fs.h>
1515
#include <linux/uaccess.h>
16+
#include <linux/ratelimit.h>
1617
#include <asm/alignment.h>
1718
#include <asm/processor.h>
1819

@@ -95,13 +96,13 @@ int set_unalign_ctl(struct task_struct *tsk, unsigned int val)
9596
void unaligned_fixups_notify(struct task_struct *tsk, insn_size_t insn,
9697
struct pt_regs *regs)
9798
{
98-
if (user_mode(regs) && (se_usermode & UM_WARN) && printk_ratelimit())
99-
pr_notice("Fixing up unaligned userspace access "
99+
if (user_mode(regs) && (se_usermode & UM_WARN))
100+
pr_notice_ratelimited("Fixing up unaligned userspace access "
100101
"in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
101102
tsk->comm, task_pid_nr(tsk),
102103
(void *)instruction_pointer(regs), insn);
103-
else if (se_kernmode_warn && printk_ratelimit())
104-
pr_notice("Fixing up unaligned kernel access "
104+
else if (se_kernmode_warn)
105+
pr_notice_ratelimited("Fixing up unaligned kernel access "
105106
"in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
106107
tsk->comm, task_pid_nr(tsk),
107108
(void *)instruction_pointer(regs), insn);

0 commit comments

Comments
 (0)