From: Joao Martins <joao.m.martins@oracle.com>
Date: Thu, 1 Jun 2017 12:21:56 +0000 (+0100)
Subject: Merge branch 'uek4/topic/uek-4.1/xen-bug26107942' into uek/uek-next/for-chander-bug26... 
X-Git-Tag: v4.1.12-102.0.20170601_1400~213
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e78bfbc81feeafa24cc084ba0126aeb6f4dbb550;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'uek4/topic/uek-4.1/xen-bug26107942' into uek/uek-next/for-chander-bug26107942

 Conflicts:
	arch/x86/xen/enlighten.c
	drivers/net/xen-netfront.c
	fs/proc/generic.c
	fs/proc/internal.h

arch/x86/xen/enlighten.c had one header to not be conditionally include with
CONFIG_KEXEC introduced by commit 28a4be540b ("kexec: allow kdump with
crash_kexec_post_notifiers"); fs/proc/* had required exporting a new
symbol to be used by commit ac7bd1728ac4 ("xenfs: Use
proc_create_mount_point() to create /proc/xen"); finally the
xen-netfront.c had already accounted for the changes introduced by
9e13456b6312 and 0d1d6389b930 - hence we simply retain the topic branch
version.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
---

e78bfbc81feeafa24cc084ba0126aeb6f4dbb550
diff --cc drivers/net/xen-netfront.c
index e442641e8b872,fb73ff74487cf..6436e249b8af6
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@@ -279,9 -431,9 +431,10 @@@ static struct sk_buff *xennet_alloc_one
  
  static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
  {
+ 	domid_t otherend_id = queue->info->xbdev->otherend_id;
  	RING_IDX req_prod = queue->rx.req_prod_pvt;
  	int notify;
 +	int err = 0;
  
  	if (unlikely(!netif_carrier_ok(queue->info->netdev)))
  		return;
@@@ -289,17 -441,15 +442,17 @@@
  	for (req_prod = queue->rx.req_prod_pvt;
  	     req_prod - queue->rx.rsp_cons < NET_RX_RING_SIZE;
  	     req_prod++) {
+ 		struct xen_netif_rx_request *req;
  		struct sk_buff *skb;
  		unsigned short id;
- 		grant_ref_t ref;
  		struct page *page;
- 		struct xen_netif_rx_request *req;
+ 		grant_ref_t ref;
  
  		skb = xennet_alloc_one_rx_buffer(queue);
 -		if (!skb)
 +		if (!skb) {
 +			err = -ENOMEM;
  			break;
 +		}
  
  		id = xennet_rxidx(req_prod);