Commit 78a3cc38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  arch/powerpc: use printk_ratelimited instead of printk_ratelimit
  powerpc/rtas-rtc: remove sideeffects of printk_ratelimit
  powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig
  powerpc/e500: fix breakage with fsl_rio_mcheck_exception
  powerpc/p1022ds: fix audio-related properties in the device tree
  powerpc/85xx: fix NAND_CMD_READID read bytes number
parents 49743170 76462232

arch/powerpc/boot/dts/p1022ds.dts

+6 −3
Original line number Diff line number Diff line
@@ -209,8 +209,10 @@ 
			wm8776:codec@1a {

				compatible = "wlf,wm8776";

				reg = <0x1a>;

				/* MCLK source is a stand-alone oscillator */

				clock-frequency = <12288000>;

				/*

				 * clock-frequency will be set by U-Boot if

				 * the clock is enabled.

				 */

			};

		};
@@ -280,7 +282,8 @@ 
			codec-handle = <&wm8776>;

			fsl,playback-dma = <&dma00>;

			fsl,capture-dma = <&dma01>;

			fsl,fifo-depth = <16>;

			fsl,fifo-depth = <15>;

			fsl,ssi-asynchronous;

		};



		dma@c300 {

arch/powerpc/configs/pseries_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ CONFIG_SCSI_SAS_ATTRS=m 
CONFIG_SCSI_CXGB3_ISCSI=m

CONFIG_SCSI_CXGB4_ISCSI=m

CONFIG_SCSI_BNX2_ISCSI=m

CONFIG_SCSI_BNX2_ISCSI=m

CONFIG_BE2ISCSI=m

CONFIG_SCSI_IBMVSCSI=y

CONFIG_SCSI_IBMVFC=m

arch/powerpc/kernel/rtas-rtc.c

+17 −12
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/init.h>

#include <linux/rtc.h>

#include <linux/delay.h>

#include <linux/ratelimit.h>

#include <asm/prom.h>

#include <asm/rtas.h>

#include <asm/time.h>
@@ -29,8 +30,9 @@ unsigned long __init rtas_get_boot_time(void) 
		}

	} while (wait_time && (get_tb() < max_wait_tb));



	if (error != 0 && printk_ratelimit()) {

		printk(KERN_WARNING "error: reading the clock failed (%d)\n",

	if (error != 0) {

		printk_ratelimited(KERN_WARNING

				   "error: reading the clock failed (%d)\n",

				   error);

		return 0;

	}
@@ -55,9 +57,10 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm) 


		wait_time = rtas_busy_delay_time(error);

		if (wait_time) {

			if (in_interrupt() && printk_ratelimit()) {

			if (in_interrupt()) {

				memset(rtc_tm, 0, sizeof(struct rtc_time));

				printk(KERN_WARNING "error: reading clock"

				printk_ratelimited(KERN_WARNING

						   "error: reading clock "

						   "would delay interrupt\n");

				return;	/* delay not allowed */

			}
@@ -65,8 +68,9 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm) 
		}

	} while (wait_time && (get_tb() < max_wait_tb));



        if (error != 0 && printk_ratelimit()) {

                printk(KERN_WARNING "error: reading the clock failed (%d)\n",

	if (error != 0) {

		printk_ratelimited(KERN_WARNING

				   "error: reading the clock failed (%d)\n",

				   error);

		return;

        }
@@ -99,8 +103,9 @@ int rtas_set_rtc_time(struct rtc_time *tm) 
		}

	} while (wait_time && (get_tb() < max_wait_tb));



        if (error != 0 && printk_ratelimit())

                printk(KERN_WARNING "error: setting the clock failed (%d)\n",

	if (error != 0)

		printk_ratelimited(KERN_WARNING

				   "error: setting the clock failed (%d)\n",

				   error);



        return 0;

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 @@ badframe: 
	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 @@ badframe: 
	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 @@ badframe: 
	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 @@ badframe: 
	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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE