Commit 76462232 authored by Christian Dietrich's avatar Christian Dietrich Committed by Benjamin Herrenschmidt
Browse files

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: default avatarChristian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9a8f99fa

arch/powerpc/kernel/signal_32.c

+31 −26
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/errno.h>

#include <linux/elf.h>

#include <linux/ptrace.h>

#include <linux/ratelimit.h>

#ifdef CONFIG_PPC64

#include <linux/syscalls.h>

#include <linux/compat.h>
@@ -892,8 +893,9 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka, 
	printk("badframe in handle_rt_signal, regs=%p frame=%p newsp=%lx\n",

	       regs, frame, newsp);

#endif

	if (show_unhandled_signals && printk_ratelimit())

		printk(KERN_INFO "%s[%d]: bad frame in handle_rt_signal32: "

	if (show_unhandled_signals)

		printk_ratelimited(KERN_INFO

				   "%s[%d]: bad frame in handle_rt_signal32: "

				   "%p nip %08lx lr %08lx\n",

				   current->comm, current->pid,

				   addr, regs->nip, regs->link);
@@ -1058,8 +1060,9 @@ long sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, 
	return 0;



 bad:

	if (show_unhandled_signals && printk_ratelimit())

		printk(KERN_INFO "%s[%d]: bad frame in sys_rt_sigreturn: "

	if (show_unhandled_signals)

		printk_ratelimited(KERN_INFO

				   "%s[%d]: bad frame in sys_rt_sigreturn: "

				   "%p nip %08lx lr %08lx\n",

				   current->comm, current->pid,

				   rt_sf, regs->nip, regs->link);
@@ -1149,8 +1152,8 @@ int sys_debug_setcontext(struct ucontext __user *ctx, 
	 * We kill the task with a SIGSEGV in this situation.

	 */

	if (do_setcontext(ctx, regs, 1)) {

		if (show_unhandled_signals && printk_ratelimit())

			printk(KERN_INFO "%s[%d]: bad frame in "

		if (show_unhandled_signals)

			printk_ratelimited(KERN_INFO "%s[%d]: bad frame in "

					   "sys_debug_setcontext: %p nip %08lx "

					   "lr %08lx\n",

					   current->comm, current->pid,
@@ -1236,8 +1239,9 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka, 
	printk("badframe in handle_signal, regs=%p frame=%p newsp=%lx\n",

	       regs, frame, newsp);

#endif

	if (show_unhandled_signals && printk_ratelimit())

		printk(KERN_INFO "%s[%d]: bad frame in handle_signal32: "

	if (show_unhandled_signals)

		printk_ratelimited(KERN_INFO

				   "%s[%d]: bad frame in handle_signal32: "

				   "%p nip %08lx lr %08lx\n",

				   current->comm, current->pid,

				   frame, regs->nip, regs->link);
@@ -1288,8 +1292,9 @@ long sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, 
	return 0;



badframe:

	if (show_unhandled_signals && printk_ratelimit())

		printk(KERN_INFO "%s[%d]: bad frame in sys_sigreturn: "

	if (show_unhandled_signals)

		printk_ratelimited(KERN_INFO

				   "%s[%d]: bad frame in sys_sigreturn: "

				   "%p nip %08lx lr %08lx\n",

				   current->comm, current->pid,

				   addr, regs->nip, regs->link);

arch/powerpc/kernel/signal_64.c

+9 −8
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/elf.h>

#include <linux/ptrace.h>

#include <linux/module.h>

#include <linux/ratelimit.h>



#include <asm/sigcontext.h>

#include <asm/ucontext.h>
@@ -380,8 +381,8 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5, 
	printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n",

	       regs, uc, &uc->uc_mcontext);

#endif

	if (show_unhandled_signals && printk_ratelimit())

		printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,

	if (show_unhandled_signals)

		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,

				   current->comm, current->pid, "rt_sigreturn",

				   (long)uc, regs->nip, regs->link);
@@ -468,8 +469,8 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, 
	printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n",

	       regs, frame, newsp);

#endif

	if (show_unhandled_signals && printk_ratelimit())

		printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,

	if (show_unhandled_signals)

		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,

				   current->comm, current->pid, "setup_rt_frame",

				   (long)frame, regs->nip, regs->link);

arch/powerpc/kernel/traps.c

+10 −12
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/bug.h>

#include <linux/kdebug.h>

#include <linux/debugfs.h>

#include <linux/ratelimit.h>



#include <asm/emulated_ops.h>

#include <asm/pgtable.h>
@@ -197,9 +198,8 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr) 
		if (die("Exception in kernel mode", regs, signr))

			return;

	} else if (show_unhandled_signals &&

		    unhandled_signal(current, signr) &&

		    printk_ratelimit()) {

			printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,

		   unhandled_signal(current, signr)) {

		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,

				   current->comm, current->pid, signr,

				   addr, regs->nip, regs->link, code);

	}
@@ -1342,8 +1342,7 @@ void altivec_assist_exception(struct pt_regs *regs) 
	} else {

		/* didn't recognize the instruction */

		/* XXX quick hack for now: set the non-Java bit in the VSCR */

		if (printk_ratelimit())

			printk(KERN_ERR "Unrecognized altivec instruction "

		printk_ratelimited(KERN_ERR "Unrecognized altivec instruction "

				   "in %s at %lx\n", current->comm, regs->nip);

		current->thread.vscr.u[3] |= 0x10000;

	}
@@ -1548,8 +1547,7 @@ u32 ppc_warn_emulated; 


void ppc_warn_emulated_print(const char *type)

{

	if (printk_ratelimit())

		pr_warning("%s used emulated %s instruction\n", current->comm,

	pr_warn_ratelimited("%s used emulated %s instruction\n", current->comm,

			    type);

}

arch/powerpc/mm/fault.c

+5 −5
Original line number Diff line number Diff line
@@ -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,9 +347,8 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, 
		return 0;

	}



	if (is_exec && (error_code & DSISR_PROTFAULT)

	    && printk_ratelimit())

		printk(KERN_CRIT "kernel tried to execute NX-protected"

	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());

arch/powerpc/sysdev/mpic.c

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

#include <linux/slab.h>

#include <linux/syscore_ops.h>

#include <linux/ratelimit.h>



#include <asm/ptrace.h>

#include <asm/signal.h>
@@ -1648,8 +1649,7 @@ static unsigned int _mpic_get_one_irq(struct mpic *mpic, int reg) 
		return NO_IRQ;

	}

	if (unlikely(mpic->protected && test_bit(src, mpic->protected))) {

		if (printk_ratelimit())

			printk(KERN_WARNING "%s: Got protected source %d !\n",

		printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n",

				   mpic->name, (int)src);

		mpic_eoi(mpic);

		return NO_IRQ;
@@ -1688,8 +1688,7 @@ unsigned int mpic_get_coreint_irq(void) 
		return NO_IRQ;

	}

	if (unlikely(mpic->protected && test_bit(src, mpic->protected))) {

		if (printk_ratelimit())

			printk(KERN_WARNING "%s: Got protected source %d !\n",

		printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n",

				   mpic->name, (int)src);

		return NO_IRQ;

	}