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

Commit 86d9fc12 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'release', 'idle', 'redhat-bugzilla-436589', 'sbs' and 'video' into release

parents 08dcf29e 8e92b660 33fd7afd 7642d211 5c9fcb5d

drivers/acpi/processor_idle.c

+5 −2
Original line number Diff line number Diff line
@@ -1487,7 +1487,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, 
		return 0;

	}



	acpi_unlazy_tlb(smp_processor_id());

	/*

	 * Must be done before busmaster disable as we might need to

	 * access HPET !
@@ -1577,6 +1576,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, 
		return 0;

	}



	acpi_unlazy_tlb(smp_processor_id());



	/* Tell the scheduler that we are going deep-idle: */

	sched_clock_idle_sleep_event();

	/*
@@ -1692,7 +1693,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) 
		switch (cx->type) {

			case ACPI_STATE_C1:

			state->flags |= CPUIDLE_FLAG_SHALLOW;

			if (cx->entry_method == ACPI_CSTATE_FFH)

				state->flags |= CPUIDLE_FLAG_TIME_VALID;



			state->enter = acpi_idle_enter_c1;

			dev->safe_state = state;

			break;

drivers/acpi/sbshc.c

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, 
		goto end;

	}

	smb_hc_write(hc, ACPI_SMB_COMMAND, command);

	smb_hc_write(hc, ACPI_SMB_COMMAND, command);

	if (!(protocol & 0x01)) {

		smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length);

		for (i = 0; i < length; ++i)

drivers/acpi/scan.c

+12 −6
Original line number Diff line number Diff line
@@ -39,20 +39,26 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias, 
			   int size)

{

	int len;

	int count;



	if (!acpi_dev->flags.hardware_id)

	if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids)

		return -ENODEV;



	len = snprintf(modalias, size, "acpi:%s:",

	len = snprintf(modalias, size, "acpi:");

	size -= len;



	if (acpi_dev->flags.hardware_id) {

		count = snprintf(&modalias[len], size, "%s:",

				 acpi_dev->pnp.hardware_id);

	if (len < 0 || len >= size)

		if (count < 0 || count >= size)

			return -EINVAL;

	size -= len;

		len += count;

		size -= count;

	}



	if (acpi_dev->flags.compatible_ids) {

		struct acpi_compatible_id_list *cid_list;

		int i;

		int count;



		cid_list = acpi_dev->pnp.cid_list;

		for (i = 0; i < cid_list->count; i++) {

drivers/cpuidle/cpuidle.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void cpuidle_idle_call(void) 
	/* enter the state and update stats */

	dev->last_residency = target_state->enter(dev, target_state);

	dev->last_state = target_state;

	target_state->time += dev->last_residency;

	target_state->time += (unsigned long long)dev->last_residency;

	target_state->usage++;



	/* give the governor an opportunity to reflect on the outcome */
@@ -224,7 +224,7 @@ static void poll_idle_init(struct cpuidle_device *dev) 
	state->exit_latency = 0;

	state->target_residency = 0;

	state->power_usage = -1;

	state->flags = CPUIDLE_FLAG_POLL | CPUIDLE_FLAG_TIME_VALID;

	state->flags = CPUIDLE_FLAG_POLL;

	state->enter = poll_idle;

}

#else

drivers/cpuidle/sysfs.c

+8 −2
Original line number Diff line number Diff line
@@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ 
	return sprintf(buf, "%u\n", state->_name);\

}



#define define_show_state_ull_function(_name) \

static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \

{ \

	return sprintf(buf, "%llu\n", state->_name);\

}



#define define_show_state_str_function(_name) \

static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \

{ \
@@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ 


define_show_state_function(exit_latency)

define_show_state_function(power_usage)

define_show_state_function(usage)

define_show_state_function(time)

define_show_state_ull_function(usage)

define_show_state_ull_function(time)

define_show_state_str_function(name)

define_show_state_str_function(desc)