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

Commit 56a50f20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are two hyperv driver fixes, and one i8k driver fix for 3.16"

* tag 'char-misc-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  i8k: Fix non-SMP operation
  Drivers: hv: util: Fix a bug in the KVP code
  Drivers: hv: vmbus: Fix a bug in the channel callback dispatch code
parents 303f8ad1 6d827fbc

drivers/char/i8k.c

+3 −1
Original line number Diff line number Diff line
@@ -138,7 +138,9 @@ static int i8k_smm(struct smm_regs *regs) 
	if (!alloc_cpumask_var(&old_mask, GFP_KERNEL))

		return -ENOMEM;

	cpumask_copy(old_mask, &current->cpus_allowed);

	set_cpus_allowed_ptr(current, cpumask_of(0));

	rc = set_cpus_allowed_ptr(current, cpumask_of(0));

	if (rc)

		goto out;

	if (smp_processor_id() != 0) {

		rc = -EBUSY;

		goto out;

drivers/hv/connection.c

+6 −2
Original line number Diff line number Diff line
@@ -339,9 +339,13 @@ static void process_chn_event(u32 relid) 
		 */



		do {

			if (read_state)

				hv_begin_read(&channel->inbound);

			channel->onchannel_callback(arg);

			if (read_state)

				bytes_to_read = hv_end_read(&channel->inbound);

			else

				bytes_to_read = 0;

		} while (read_state && (bytes_to_read != 0));

	} else {

		pr_err("no channel callback for relid - %u\n", relid);

drivers/hv/hv_kvp.c

+14 −3
Original line number Diff line number Diff line
@@ -127,6 +127,17 @@ kvp_work_func(struct work_struct *dummy) 
	kvp_respond_to_host(NULL, HV_E_FAIL);

}



static void poll_channel(struct vmbus_channel *channel)

{

	if (channel->target_cpu != smp_processor_id())

		smp_call_function_single(channel->target_cpu,

					 hv_kvp_onchannelcallback,

					 channel, true);

	else

		hv_kvp_onchannelcallback(channel);

}





static int kvp_handle_handshake(struct hv_kvp_msg *msg)

{

	int ret = 1;
@@ -155,7 +166,7 @@ static int kvp_handle_handshake(struct hv_kvp_msg *msg) 
		kvp_register(dm_reg_value);

		kvp_transaction.active = false;

		if (kvp_transaction.kvp_context)

			hv_kvp_onchannelcallback(kvp_transaction.kvp_context);

			poll_channel(kvp_transaction.kvp_context);

	}

	return ret;

}
@@ -568,7 +579,7 @@ kvp_respond_to_host(struct hv_kvp_msg *msg_to_host, int error) 


	vmbus_sendpacket(channel, recv_buffer, buf_len, req_id,

				VM_PKT_DATA_INBAND, 0);



	poll_channel(channel);

}



/*
@@ -603,7 +614,7 @@ void hv_kvp_onchannelcallback(void *context) 
		return;

	}



	vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 2, &recvlen,

	vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 4, &recvlen,

			 &requestid);



	if (recvlen > 0) {

drivers/hv/hv_util.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int util_probe(struct hv_device *dev, 
		(struct hv_util_service *)dev_id->driver_data;

	int ret;



	srv->recv_buffer = kmalloc(PAGE_SIZE * 2, GFP_KERNEL);

	srv->recv_buffer = kmalloc(PAGE_SIZE * 4, GFP_KERNEL);

	if (!srv->recv_buffer)

		return -ENOMEM;

	if (srv->util_init) {