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

Commit 3b8fc0b7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.158 (f9e41343) into msm-4.4"

parents 8f037f0b d9a87945

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 157

SUBLEVEL = 158

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/qcom/apq8016-sbc.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
			led@6 {

				label = "apq8016-sbc:blue:bt";

				gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;

				linux,default-trigger = "bt";

				linux,default-trigger = "bluetooth-power";

				default-state = "off";

			};

		};

arch/arm/kernel/entry-common.S

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/unistd.h>

#include <asm/ftrace.h>

#include <asm/unwind.h>

#include <asm/memory.h>



#ifdef CONFIG_NEED_RET_TO_USER

#include <mach/entry-macro.S>
@@ -35,6 +36,9 @@ ret_fast_syscall: 
 UNWIND(.fnstart	)

 UNWIND(.cantunwind	)

	disable_irq_notrace			@ disable interrupts

	ldr	r2, [tsk, #TI_ADDR_LIMIT]

	cmp	r2, #TASK_SIZE

	blne	addr_limit_check_failed

	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing

	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK

	bne	fast_work_pending
@@ -61,6 +65,9 @@ ret_fast_syscall: 
 UNWIND(.cantunwind	)

	str	r0, [sp, #S_R0 + S_OFF]!	@ save returned r0

	disable_irq_notrace			@ disable interrupts

	ldr	r2, [tsk, #TI_ADDR_LIMIT]

	cmp	r2, #TASK_SIZE

	blne	addr_limit_check_failed

	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing

	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK

	beq	no_work_pending
@@ -93,6 +100,9 @@ ENTRY(ret_to_user) 
ret_slow_syscall:

	disable_irq_notrace			@ disable interrupts

ENTRY(ret_to_user_from_irq)

	ldr	r2, [tsk, #TI_ADDR_LIMIT]

	cmp	r2, #TASK_SIZE

	blne	addr_limit_check_failed

	ldr	r1, [tsk, #TI_FLAGS]

	tst	r1, #_TIF_WORK_MASK

	bne	slow_work_pending

arch/arm/kernel/signal.c

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/uaccess.h>

#include <linux/tracehook.h>

#include <linux/uprobes.h>

#include <linux/syscalls.h>



#include <asm/elf.h>

#include <asm/cacheflush.h>
@@ -631,3 +632,9 @@ struct page *get_signal_page(void) 


	return page;

}



/* Defer to generic check */

asmlinkage void addr_limit_check_failed(void)

{

	addr_limit_user_check();

}

arch/arm/mach-exynos/suspend.c

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node, 
					  NULL);

	if (!domain) {

		iounmap(pmu_base_addr);

		pmu_base_addr = NULL;

		return -ENOMEM;

	}