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

Commit a2c5ca32 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.190 (ac7fbcaa) into msm-4.4"

parents 53eacca7 0748a0e2

Makefile

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

VERSION = 4

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 189

SUBLEVEL = 190

EXTRAVERSION =

EXTRAVERSION =

NAME = Blurry Fish Butt

NAME = Blurry Fish Butt

arch/arm/mach-davinci/sleep.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define DEEPSLEEP_SLEEPENABLE_BIT	BIT(31)

#define DEEPSLEEP_SLEEPENABLE_BIT	BIT(31)





	.text

	.text

	.arch	armv5te

/*

/*

 * Move DaVinci into deep sleep state

 * Move DaVinci into deep sleep state

 *

 *

arch/arm64/kernel/hw_breakpoint.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -548,13 +548,14 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) 
			/* Aligned */

			/* Aligned */

			break;

			break;

		case 1:

		case 1:

			/* Allow single byte watchpoint. */

			if (info->ctrl.len == ARM_BREAKPOINT_LEN_1)

				break;

		case 2:

		case 2:

			/* Allow halfword watchpoints and breakpoints. */

			/* Allow halfword watchpoints and breakpoints. */

			if (info->ctrl.len == ARM_BREAKPOINT_LEN_2)

			if (info->ctrl.len == ARM_BREAKPOINT_LEN_2)

				break;

				break;

		case 3:

			/* Allow single byte watchpoint. */

			if (info->ctrl.len == ARM_BREAKPOINT_LEN_1)

				break;

		default:

		default:

			return -EINVAL;

			return -EINVAL;

		}

		}

arch/sh/kernel/hw_breakpoint.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -160,6 +160,7 @@ int arch_bp_generic_fields(int sh_len, int sh_type, 
	switch (sh_type) {

	switch (sh_type) {

	case SH_BREAKPOINT_READ:

	case SH_BREAKPOINT_READ:

		*gen_type = HW_BREAKPOINT_R;

		*gen_type = HW_BREAKPOINT_R;

		break;

	case SH_BREAKPOINT_WRITE:

	case SH_BREAKPOINT_WRITE:

		*gen_type = HW_BREAKPOINT_W;

		*gen_type = HW_BREAKPOINT_W;

		break;

		break;

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ KBUILD_CFLAGS += $(cflags-y) 
KBUILD_CFLAGS += -mno-mmx -mno-sse

KBUILD_CFLAGS += -mno-mmx -mno-sse

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)

KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)





KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n

GCOV_PROFILE := n