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

Commit 1111b680 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes. 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 37b6cb47 24223657

Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ Optional Properties (for HDMI pins): 
Example:

// pin controller node

pinctrl@35004800 {

	compatible = "brcmbcm11351-pinctrl";

	compatible = "brcm,bcm11351-pinctrl";

	reg = <0x35004800 0x430>;



	// pin configuration node

arch/arm/configs/bcm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ CONFIG_CRC_ITU_T=y 
CONFIG_CRC7=y

CONFIG_XZ_DEC=y

CONFIG_AVERAGE=y

CONFIG_PINCTRL_CAPRI=y

CONFIG_PINCTRL_BCM281XX=y

CONFIG_WATCHDOG=y

CONFIG_BCM_KONA_WDT=y

CONFIG_BCM_KONA_WDT_DEBUG=y

arch/ia64/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ start_ap: 
	 * Switch into virtual mode:

	 */

	movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN \

		  |IA64_PSR_DI|IA64_PSR_AC)

		  |IA64_PSR_DI)

	;;

	mov cr.ipsr=r16

	movl r17=1f

arch/ia64/kernel/ivt.S

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#include <asm/unistd.h>

#include <asm/errno.h>



#if 1

#if 0

# define PSR_DEFAULT_BITS	psr.ac

#else

# define PSR_DEFAULT_BITS	0

arch/ia64/kvm/vmm_ivt.S

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#include "kvm_minstate.h"

#include "vti.h"



#if 1

#if 0

# define PSR_DEFAULT_BITS   psr.ac

#else

# define PSR_DEFAULT_BITS   0