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

Commit 3ebe3bd8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c50f6245 2c81a647

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -595,6 +595,10 @@ S: Odd Fixes 
L:	linux-alpha@vger.kernel.org

F:	arch/alpha/



ALPS PS/2 TOUCHPAD DRIVER

R:	Pali Rohár <pali.rohar@gmail.com>

F:	drivers/input/mouse/alps.*



ALTERA MAILBOX DRIVER

M:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
@@ -7420,7 +7424,7 @@ F: drivers/scsi/megaraid.* 
F:	drivers/scsi/megaraid/



MELLANOX ETHERNET DRIVER (mlx4_en)

M: 	Eugenia Emantayev <eugenia@mellanox.com>

M:	Tariq Toukan <tariqt@mellanox.com>

L:	netdev@vger.kernel.org

S:	Supported

W:	http://www.mellanox.com
@@ -8959,6 +8963,7 @@ L: linux-gpio@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git

S:	Maintained

F:	Documentation/devicetree/bindings/pinctrl/

F:	Documentation/pinctrl.txt

F:	drivers/pinctrl/

F:	include/linux/pinctrl/

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -363,11 +363,13 @@ CHECK = sparse 


CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void $(CF)

NOSTDINC_FLAGS  =

CFLAGS_MODULE   =

AFLAGS_MODULE   =

LDFLAGS_MODULE  =

CFLAGS_KERNEL	=

AFLAGS_KERNEL	=

LDFLAGS_vmlinux =

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized

CFLAGS_KCOV	= -fsanitize-coverage=trace-pc

arch/arc/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ endif 


endif



cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -fasynchronous-unwind-tables



# By default gcc 4.8 generates dwarf4 which kernel unwinder can't grok

ifeq ($(atleast_gcc48),y)

cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -gdwarf-2

arch/arc/kernel/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs, 
	 * prelogue is setup (callee regs saved and then fp set and not other

	 * way around

	 */

	pr_warn("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");

	pr_warn_once("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");

	return 0;



#endif

arch/arm/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) 
	kvm_timer_vcpu_terminate(vcpu);

	kvm_vgic_vcpu_destroy(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);

	kvm_vcpu_uninit(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}