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

Commit 4df80cc4 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.132 (46155cc7) into msm-4.4"

parents 32645e12 a0cf9875

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 131

SUBLEVEL = 132

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/s390/kvm/kvm-s390.c

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 


/* upper facilities limit for kvm */

unsigned long kvm_s390_fac_list_mask[] = {

	0xffe6fffbfcfdfc40UL,

	0x005e800000000000UL,

	0xffe6ffffffffffffUL,

	0x005effffffffffffUL,

};



unsigned long kvm_s390_fac_list_mask_size(void)

arch/x86/configs/x86_64_cuttlefish_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ CONFIG_PHYSICAL_START=0x200000 
CONFIG_RANDOMIZE_BASE=y

CONFIG_PHYSICAL_ALIGN=0x1000000

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttyS0 reboot=p"

CONFIG_CMDLINE="console=ttyS0 reboot=p nopti"

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

arch/x86/kernel/cpu/perf_event.c

+7 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/cpu.h>

#include <linux/bitops.h>

#include <linux/device.h>

#include <linux/nospec.h>



#include <asm/apic.h>

#include <asm/stacktrace.h>
@@ -300,14 +301,17 @@ set_ext_hw_attr(struct hw_perf_event *hwc, struct perf_event *event) 
	cache_type = (config >> 0) & 0xff;

	if (cache_type >= PERF_COUNT_HW_CACHE_MAX)

		return -EINVAL;

	cache_type = array_index_nospec(cache_type, PERF_COUNT_HW_CACHE_MAX);



	cache_op = (config >>  8) & 0xff;

	if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)

		return -EINVAL;

	cache_op = array_index_nospec(cache_op, PERF_COUNT_HW_CACHE_OP_MAX);



	cache_result = (config >> 16) & 0xff;

	if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)

		return -EINVAL;

	cache_result = array_index_nospec(cache_result, PERF_COUNT_HW_CACHE_RESULT_MAX);



	val = hw_cache_event_ids[cache_type][cache_op][cache_result];
@@ -404,6 +408,8 @@ int x86_setup_perfctr(struct perf_event *event) 
	if (attr->config >= x86_pmu.max_events)

		return -EINVAL;



	attr->config = array_index_nospec((unsigned long)attr->config, x86_pmu.max_events);



	/*

	 * The generic map:

	 */

arch/x86/kernel/cpu/perf_event_intel_cstate.c

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

#include <linux/slab.h>

#include <linux/perf_event.h>

#include <linux/nospec.h>

#include <asm/cpu_device_id.h>

#include "perf_event.h"
@@ -409,6 +410,7 @@ static int cstate_pmu_event_init(struct perf_event *event) 
	} else if (event->pmu == &cstate_pkg_pmu) {

		if (cfg >= PERF_CSTATE_PKG_EVENT_MAX)

			return -EINVAL;

		cfg = array_index_nospec((unsigned long)cfg, PERF_CSTATE_PKG_EVENT_MAX);

		if (!pkg_msr[cfg].attr)

			return -EINVAL;

		event->hw.event_base = pkg_msr[cfg].msr;