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

Commit 9ab3a15d authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: use printk_ratelimited instead of printk_ratelimit 



Follows the powerpc change, for much the same rationale.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 7b61ca5d

arch/sh/kernel/irq.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/ftrace.h>

#include <linux/ftrace.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/ratelimit.h>

#include <asm/processor.h>

#include <asm/processor.h>

#include <asm/machvec.h>

#include <asm/machvec.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>
@@ -268,8 +269,7 @@ void migrate_irqs(void) 
			unsigned int newcpu = cpumask_any_and(data->affinity,

			unsigned int newcpu = cpumask_any_and(data->affinity,

							      cpu_online_mask);

							      cpu_online_mask);

			if (newcpu >= nr_cpu_ids) {

			if (newcpu >= nr_cpu_ids) {

				if (printk_ratelimit())

				pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",

					printk(KERN_INFO "IRQ%u no longer affine to CPU%u\n",

						    irq, cpu);

						    irq, cpu);





				cpumask_setall(data->affinity);

				cpumask_setall(data->affinity);

arch/sh/mm/alignment.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/proc_fs.h>

#include <linux/proc_fs.h>

#include <linux/uaccess.h>

#include <linux/uaccess.h>

#include <linux/ratelimit.h>

#include <asm/alignment.h>

#include <asm/alignment.h>

#include <asm/processor.h>

#include <asm/processor.h>
@@ -95,13 +96,13 @@ int set_unalign_ctl(struct task_struct *tsk, unsigned int val) 
void unaligned_fixups_notify(struct task_struct *tsk, insn_size_t insn,

void unaligned_fixups_notify(struct task_struct *tsk, insn_size_t insn,

			     struct pt_regs *regs)

			     struct pt_regs *regs)

{

{

	if (user_mode(regs) && (se_usermode & UM_WARN) && printk_ratelimit())

	if (user_mode(regs) && (se_usermode & UM_WARN))

		pr_notice("Fixing up unaligned userspace access "

		pr_notice_ratelimited("Fixing up unaligned userspace access "

			  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",

			  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",

			  tsk->comm, task_pid_nr(tsk),

			  tsk->comm, task_pid_nr(tsk),

			  (void *)instruction_pointer(regs), insn);

			  (void *)instruction_pointer(regs), insn);

	else if (se_kernmode_warn && printk_ratelimit())

	else if (se_kernmode_warn)

		pr_notice("Fixing up unaligned kernel access "

		pr_notice_ratelimited("Fixing up unaligned kernel access "

			  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",

			  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",

			  tsk->comm, task_pid_nr(tsk),

			  tsk->comm, task_pid_nr(tsk),

			  (void *)instruction_pointer(regs), insn);

			  (void *)instruction_pointer(regs), insn);