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

Commit 2548bed0 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.9.223(2d2170bb) into msm-4.9"

parents 70a84627 e3ff9b31

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 221

SUBLEVEL = 223

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/kernel/perf_event_mipsxx.c

+5 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,6 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config) 
		break;

	case CPU_P5600:

	case CPU_P6600:

	case CPU_I6400:

		/* 8-bit event numbers */

		raw_id = config & 0x1ff;

		base_id = raw_id & 0xff;
@@ -1618,6 +1617,11 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config) 
		raw_event.range = P;

#endif

		break;

	case CPU_I6400:

		/* 8-bit event numbers */

		base_id = config & 0xff;

		raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;

		break;

	case CPU_1004K:

		if (IS_BOTH_COUNTERS_1004K_EVENT(base_id))

			raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;

arch/powerpc/kernel/pci_of_scan.c

+10 −2
Original line number Diff line number Diff line
@@ -82,10 +82,16 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) 
	const __be32 *addrs;

	u32 i;

	int proplen;

	bool mark_unset = false;



	addrs = of_get_property(node, "assigned-addresses", &proplen);

	if (!addrs)

	if (!addrs || !proplen) {

		addrs = of_get_property(node, "reg", &proplen);

		if (!addrs || !proplen)

			return;

		mark_unset = true;

	}



	pr_debug("    parse addresses (%d bytes) @ %p\n", proplen, addrs);

	for (; proplen >= 20; proplen -= 20, addrs += 5) {

		flags = pci_parse_of_flags(of_read_number(addrs, 1), 0);
@@ -110,6 +116,8 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) 
			continue;

		}

		res->flags = flags;

		if (mark_unset)

			res->flags |= IORESOURCE_UNSET;

		res->name = pci_name(dev);

		region.start = base;

		region.end = base + size - 1;

drivers/acpi/device_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -226,13 +226,13 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
 end:

	if (result) {

		dev_warn(&device->dev, "Failed to change power state to %s\n",

			 acpi_power_state_string(state));

			 acpi_power_state_string(target_state));

	} else {

		device->power.state = target_state;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Device [%s] transitioned to %s\n",

				  device->pnp.bus_id,

				  acpi_power_state_string(state)));

				  acpi_power_state_string(target_state)));

	}



	return result;

drivers/dma/dmatest.c

+2 −2
Original line number Diff line number Diff line
@@ -505,8 +505,8 @@ static int dmatest_func(void *data) 
	flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;



	ktime = ktime_get();

	while (!kthread_should_stop()

	       && !(params->iterations && total_tests >= params->iterations)) {

	while (!(kthread_should_stop() ||

	       (params->iterations && total_tests >= params->iterations))) {

		struct dma_async_tx_descriptor *tx = NULL;

		struct dmaengine_unmap_data *um;

		dma_addr_t srcs[src_cnt];