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

Commit 785e337e 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.173 (64b56442) into msm-4.4"

parents e2a34f15 b4248fb5

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 172

SUBLEVEL = 173

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/include/asm/perf_event.h

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ static const char * const arc_pmu_ev_hw_map[] = { 


	/* counts condition */

	[PERF_COUNT_HW_INSTRUCTIONS] = "iall",

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmp", /* Excludes ZOL jumps */

	/* All jump instructions that are taken */

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmptak",

	[PERF_COUNT_ARC_BPOK]         = "bpok",	  /* NP-NT, PT-T, PNT-NT */

#ifdef CONFIG_ISA_ARCV2

	[PERF_COUNT_HW_BRANCH_MISSES] = "bpmp",

arch/arm/mach-cns3xxx/pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus, 
	} else /* remote PCI bus */

		base = cnspci->cfg1_regs + ((busno & 0xf) << 20);



	return base + (where & 0xffc) + (devfn << 12);

	return base + where + (devfn << 12);

}



static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,

arch/arm64/configs/cuttlefish_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ CONFIG_USB_CONFIGFS_F_MIDI=y 
CONFIG_MMC=y

# CONFIG_MMC_BLOCK is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_HCTOSYS is not set

# CONFIG_RTC_SYSTOHC is not set

CONFIG_RTC_DRV_PL031=y

CONFIG_VIRTIO_PCI=y

arch/arm64/kernel/hyp-stub.S

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <asm/virt.h>



	.text

	.pushsection	.hyp.text, "ax"



	.align 11



ENTRY(__hyp_stub_vectors)